From f34c966b68f73f0335fef19dcb31e4d23860d13a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 24 十一月 2020 14:57:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/WEB-INF/config.properties | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/WEB-INF/config.properties b/src/main/webapp/WEB-INF/config.properties
index 9179a8a..c104894 100644
--- a/src/main/webapp/WEB-INF/config.properties
+++ b/src/main/webapp/WEB-INF/config.properties
@@ -46,8 +46,9 @@
#\uFFFD\uFFFD\uFFFD\uFFFD\u0524\uFFFD\uFFFD
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F2\uFFFD\uFFFD\uFFFD
-alarm.url = ${institute.url}/daping/sendWarnInfo.json
+#alarm.url = ${institute.url}/daping/sendWarnInfo.json
alarm.type = smartlab
+alarm.url = ${alarm.url}
institute.id = ${institute.id}
--
Gitblit v1.9.2