Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

Conflicts: jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
28-177 数据库
1 changed files with 2 additions and 2 deletions
--- a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@ -133,9 +133,9 @@ spring:
        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
      datasource:
        master:
-          url: jdbc:mysql://10.121.0.126:3306/hnjd_comp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://10.100.200.177:3306/hnjd_comp0728?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
          username: root
-          password: 123456
+          password: root
          driver-class-name: com.mysql.cj.jdbc.Driver
          # 多数据源配置  10.121.0.28
          #multi-datasource1:
Author	SHA1	Message	Date
喻忠伟	227b2ee93d	Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp Conflicts: jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml	4 months ago
喻忠伟	a0544fecae	28-177 数据库	4 months ago