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

diff --git a/src/main/webapp/WEB-INF/config.properties b/src/main/webapp/WEB-INF/config.properties
index 3c2647e..1febb0c 100644
--- a/src/main/webapp/WEB-INF/config.properties
+++ b/src/main/webapp/WEB-INF/config.properties
@@ -35,6 +35,9 @@
 smtp.from=
 smtp.subject=
 smtp.content=
+
+zkysmtp.user=xlli2020@sinano.ac.cn
+zkysmtp.pwd=Forever*#15
 #\u8C03\u7528\u7C7B EmailSendSchedule \u7535\u5B50\u90AE\u4EF6\u53D1\u9001\u8BA1\u5212(\u5355\u4F4D\u6BEB\u79D2)
 emailSend.schedule.delay=60000
 
@@ -54,3 +57,5 @@
 institute.id = ${institute.id}
 institute.name = ${institute.name}
 institute.url = ${institute.url}
+
+reagent.detail.price.api = ${reagent.detail.price.api}

--
Gitblit v1.9.2