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

guoyuji

2024-01-30 b64211f3002ec0f620d3e9bbd70f5d5991a72b59

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

@@ -20,12 +20,12 @@
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        mm:
          url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150: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
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver