Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test

# Conflicts: # modules/i3plus-core-apiservice/src/main/resources/application.properties
6 years ago · da58556193
parent 067bab119e fb2136662e
commit da58556193
1 changed files with 1 additions and 1 deletions
--- a/modules/i3plus-core-apiservice/src/main/resources/application.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties
@ -1,5 +1,5 @@
 #使用配置
-spring.profiles.active=docker
+spring.profiles.active=test
 #项目描述信息（swagger中显式），中文使用uncode转码
 desc.application.name=\u6838\u5fc3\u7ba1\u7406\u540e\u53f0