From 603e9146d9c09c9cfbadb4d049d3e6111a2f9b14 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 03 十二月 2020 16:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/webapp/WEB-INF/lzhws/lzhws.properties |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/WEB-INF/lzhws/lzhws.properties b/src/main/webapp/WEB-INF/lzhws/lzhws.properties
index 4d6adba..e57679d 100644
--- a/src/main/webapp/WEB-INF/lzhws/lzhws.properties
+++ b/src/main/webapp/WEB-INF/lzhws/lzhws.properties
@@ -7,3 +7,4 @@
 institute.url  = http://210.77.65.12:8001
 institute.app.id =
 institute.app.secret =
+alarm.url =

--
Gitblit v1.9.2