From 5d06180456819a8d3c5a092597c1f466562f1cd4 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 22 九月 2021 13:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/webapp/WEB-INF/gslab/gslab.properties b/src/main/webapp/WEB-INF/gslab/gslab.properties
index 3b91780..d45771f 100644
--- a/src/main/webapp/WEB-INF/gslab/gslab.properties
+++ b/src/main/webapp/WEB-INF/gslab/gslab.properties
@@ -9,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