From ee2678ecb9e8d686252feed920a7b2284acd54da Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:23:57 +0800
Subject: [PATCH] 冲突和修改

---
 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