Merge remote-tracking branch '公司服务器/master'

ZengTao

2024-10-16 3a38edcb5e9c15a9591e1e913d3583f3d437caf1

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml

@@ -14,6 +14,16 @@
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        pp:
          url: jdbc:mysql://127.0.0.1:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://127.0.0.1:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
  cloud:
    nacos:
      discovery:
@@ -24,4 +34,6 @@
    database: 0
    host: 127.0.0.1
    port: 6379
    password: 123456
    password: 123456
  liquibase:
    change-log: classpath:changelog/changelogBase.xml