From 074c6c4389938fc38e82b6258b8ebab95fb5aff9 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 16 九月 2021 15:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

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

diff --git a/src/main/webapp/WEB-INF/twt/twt.properties b/src/main/webapp/WEB-INF/twt/twt.properties
index ad00ef5..c335d44 100644
--- a/src/main/webapp/WEB-INF/twt/twt.properties
+++ b/src/main/webapp/WEB-INF/twt/twt.properties
@@ -1,9 +1,12 @@
 jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true
 jdbc.username=root
 jdbc.password=Sinanoaq#415
-#�й���ѧԺ�½�����̨
+#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\u00BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0328
 institute.id = 10
-institute.name = \u4e2d\u56fd\u79d1\u5b66\u9662\u65b0\u7586\u5929\u6587\u53f0
+institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u65B0\u7586\u5929\u6587\u53F0
 institute.url  = http://twt.sinanoaq.com
 institute.app.id = wxef5464cb3cd407ea
 institute.app.secret = f0b8dec4bc340a9863ed7de08cf2dcf1
+alarm.url =
+reagent.detail.price.api =
+institute.copyright= Copyright\u00A92017 \u4E2D\u56FD\u79D1\u5B66\u9662\u65B0\u7586\u5929\u6587\u53F0\u00A0\u82CFICP\u590710220403\u53F7-6

--
Gitblit v1.9.2