Merge branch 'develop_zyq' into 'develop'

线上配置密码错了

See merge request 8timerv2/8timerapiv200!428

src/main/resources/application-pro.yml

@@ -27,7 +27,7 @@ spring:
     # username: root
     # username: root
     # password: youlingHR73!
     # password: youlingHR73!
     username: youling8timer
     username: youling8timer
-    password: (!0YouLing8Timer0!)
+    password: (!0YouLingRoot0!)
     # username: tang
     # username: tang
     # password: Tang123456!
     # password: Tang123456!
     # url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL