Merge remote-tracking branch 'origin/master'

src/main/java/org/sss/presentation/noui/api/response/ErrorCode.java

@@ -12,10 +12,10 @@ public enum ErrorCode {
     LOGIN_PWD_AME_INTERVAL("R9995","已长时间未修改密码，请修改密码"),
     LOGIN_PWD_CHECK("R9994","连续多次错误密码，用户已锁定，请联系管理员！"),
     LOGIN_PARAMETER_CHECK("R9993","登陆信息不完整，用户名或密码为空"),
-    LOGIN_NON_USR("R9992","系统无此用户"),
+    LOGIN_NON_USR("R9992","用户名或密码错误"), //其实是"系统无此用户"
     LOGIN_LOCK_USR("R9991","用户已被锁定"),
     LOGIN_EXPRIED_USR("R9990","用户已被注销"),
-    LOGIN_PWD_ERROR("R9989","密码错误！"),
+    LOGIN_PWD_ERROR("R9989","用户名或密码错误！"),//其实是"密码错误"
     LOGIN_DN_ERROR("R9988","DN码错误！"),
     LOGIN_VERIFYCODE_ERROR("R9986","验证码错误！"),
     LOGIN_STATE_ABNORMAL_ERROR("R9987","无效用户");