Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-10 24bc065e9009bfb3c778e762921268a389aeaf49

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

@@ -9,6 +9,11 @@
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        salve_hangzhoumes:
          url: jdbc:sqlserver://192.168.2.100:1433;databasename=mes
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        pp:
          url: jdbc:mysql://192.168.2.100:3306/pp?serverTimezone=GMT%2b8
          username: root