Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!433

src/main/java/cn/timer/api/controller/LoginController.java

@@ -875,7 +875,7 @@ public class LoginController {
 
 			return loginhan(qyzxEmpLogin1, request);
 		} else {
-			return ResultUtil.error("帐号不存在-错误");
+			return ResultUtil.error("帐号不存在");
 		}
 
 	}

src/main/resources/application-pro.yml

@@ -31,7 +31,7 @@ spring:
     # username: tang
     # 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://rm-wz950gd8jf8209376ro.mysql.rds.aliyuncs.com/timer?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+    url: jdbc:mysql://rm-wz950gd8jf8209376.mysql.rds.aliyuncs.com/timer?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     driver-class-name: com.mysql.cj.jdbc.Driver