合并分支 'dxy' 到 'master'

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     #    url: jdbc:mysql://bj-cdb-j8ppdy86.sql.tencentcdb.com:63569/promotion_dev?autoReconnect=true
     url: jdbc:mysql://192.168.100.39:25301/promotion_dev?autoReconnect=true
     username: root
-    password: Zt%68Dsuv&M
+    password: pTM~TsFU27@f
   redis:
     port: 6379
     host: 192.168.100.40

src/main/resources/application-qa.yml

@@ -5,7 +5,7 @@ spring:
     #    url: jdbc:mysql://bj-cdb-j8ppdy86.sql.tencentcdb.com:63569/promotion_dev?autoReconnect=true
     url: jdbc:mysql://192.168.100.39:25301/promotion_dev?autoReconnect=true
     username: root
-    password: Zt%68Dsuv&M
+    password: pTM~TsFU27@f
   redis:
     port: 6379
     host: 192.168.100.40