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

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: