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

diff --git a/src/main/webapp/WEB-INF/gslab/gslab.properties b/src/main/webapp/WEB-INF/gslab/gslab.properties
index a2cbf01..d45771f 100644
--- a/src/main/webapp/WEB-INF/gslab/gslab.properties
+++ b/src/main/webapp/WEB-INF/gslab/gslab.properties
@@ -1,4 +1,5 @@
 jdbc.url=jdbc:mysql://192.168.0.228:3306/smartlabdb?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true&amp;useSSL=false
+#jdbc.url=jdbc:mysql://222.92.16.2:13306/smartlabdb?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true&amp;useSSL=false
 jdbc.username=root
 jdbc.password=Gslab@uss2021!
 
@@ -8,3 +9,5 @@
 institute.app.id =
 institute.app.secret =
 alarm.url =
+reagent.detail.price.api = https://www.reagent.com.cn/reagent-front/goodsApi/getGoodsListExact
+institute.copyright= Copyright\u00A92021 \u6750\u6599\u79D1\u5B66\u59D1\u82CF\u5B9E\u9A8C\u5BA4\u00A0\u82CFICP\u590720047331\u53F7-1

--
Gitblit v1.9.2