Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-server/src/main/resources/application-dev.yaml

@@ -43,7 +43,7 @@ spring:
       primary: master
       datasource:
         master:
-          name: mes-majoys
+          name: mes-majoys-pro-test
           url: jdbc:mysql://222.71.165.188:3309/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           driver-class-name: com.mysql.jdbc.Driver
           username: root