Merge branch 'develop_zyq' into 'develop'

提示语

See merge request 8timerv2/8timerapiv200!431

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

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