合并代码 pom 冲突

Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
yun-zuoyi
wei.peng 5 years ago
parent 4b0fb3bc25
commit 3748b554a1

@ -71,7 +71,7 @@ impp.read.datasource.password=impp_i3_core_pwd
################ 日志数据源 ################
spring.data.mongodb.database=mongoDBSource
spring.data.mongodb.uri=mongodb:27017
spring.data.mongodb.uri=mongodb://mongodb:27017
spring.data.mongodb.username=sa
spring.data.mongodb.password=i3plus
spring.data.mongodb.port=27017

Loading…
Cancel
Save