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/test/test.properties |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/WEB-INF/test/test.properties b/src/main/webapp/WEB-INF/test/test.properties
index ae8b1b9..75c14a0 100644
--- a/src/main/webapp/WEB-INF/test/test.properties
+++ b/src/main/webapp/WEB-INF/test/test.properties
@@ -7,4 +7,4 @@
 institute.url  = http://sinanoaq.com
 institute.app.id = wx81a00e3350861b25
 institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
-alarm.url =
\ No newline at end of file
+alarm.url =

--
Gitblit v1.9.2