Merge remote-tracking branch 'origin/develop_2' into develop_2

This commit is contained in:
赵肖云
2021-06-24 11:22:39 +08:00
@@ -3,9 +3,9 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://localhost:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
spring.datasource.password = Zxy20010202
spring.datasource.password = 1q2w3e4r
#==============================================
# 应用设置