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

---
 src/main/webapp/WEB-INF/szygs/szygs.properties |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/szygs/szygs.properties b/src/main/webapp/WEB-INF/szygs/szygs.properties
index 605fe7e..07f9aaa 100644
--- a/src/main/webapp/WEB-INF/szygs/szygs.properties
+++ b/src/main/webapp/WEB-INF/szygs/szygs.properties
@@ -2,9 +2,9 @@
 jdbc.username=root
 jdbc.password=SZYGS@uss20201!
 
-institute.id = 25
+institute.id = 28
 institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u751F\u7269\u533B\u5B66\u5DE5\u7A0B\u6280\u672F\u7814\u7A76\u6240
 institute.url  = http://58.210.42.60:8001/
 institute.app.id =
 institute.app.secret =
-alarm.url =
+alarm.url = http://58.210.42.60:8001/daping/sendWarnInfo.json

--
Gitblit v1.9.2