Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-01-23 b3e67abc5f7bccfc60f5ea63e81f62c3475ff8b8

 north-glass-erp/src/main/resources/application.yml

@@ -19,13 +19,13 @@
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
#        mm:
#          url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8
#          username: root
#          password: beibo.123/
#          driver-class-name: com.mysql.cj.jdbc.Driver
#        pp:
#          url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8
#          username: root
#          password: beibo.123/
#          driver-class-name: com.mysql.cj.jdbc.Driver
        mm:
          url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        pp:
          url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver