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

diff --git a/src/main/webapp/WEB-INF/szygs/szygs.properties b/src/main/webapp/WEB-INF/szygs/szygs.properties
index 07f9aaa..ca42403 100644
--- a/src/main/webapp/WEB-INF/szygs/szygs.properties
+++ b/src/main/webapp/WEB-INF/szygs/szygs.properties
@@ -8,3 +8,5 @@
 institute.app.id =
 institute.app.secret =
 alarm.url = http://58.210.42.60:8001/daping/sendWarnInfo.json
+reagent.detail.price.api =
+institute.copyright= Copyright\u00A92017 \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u751F\u7269\u533B\u5B66\u5DE5\u7A0B\u6280\u672F\u7814\u7A76\u6240\u00A0\u82CFICP\u590710220403\u53F7-6

--
Gitblit v1.9.2