Merge remote-tracking branch 'origin/master'

zhoushihao

2024-06-05 416ec0563f02d3d5b84f9b1d36bb11afdec721ec

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

@@ -9,6 +9,12 @@
          username: root
          password: root
          driver-class-name: com.mysql.cj.jdbc.Driver

        salve_hangzhoumes:
            url: jdbc:sqlserver://127.0.0.1:1433;databasename=hangzhoumes
            username: sa
            password: beibo.123/
            driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
  cloud:
    nacos:
      discovery: