From 333065f8d9b599b048668a0686ba2ee58944b0e4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 11:26:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index f6c2017..eba463b 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -15,16 +15,14 @@
     TOKEN_INVALID(-3,"token������"),
     TOKEN_CREATE_ERROR(-4,"token������������"),
     ACCOUNT_NOT_EXIST(-5,"���������������"),
-    ACCOUNT_INVALID(-6,"������������������"),
+    ACCOUNT_EXIST(-6,"������������������"),
     ACCOUNT_IS_DELETE(-7,"���������������������"),
-    PASSWORD_INVALID(-8,"������������"),
+    PASSWORD_ERROR(-8,"������������"),
     MOBILE_INVALID(-9,"���������������"),
     EMAIL_INVALID(-10,"������������"),
-    ACCOUNT_LENGTH_INVALID(-11,"������������������"),
-    PASSWORD_LENGTH_INVALID(-12,"������������������"),
-    ACCOUNT_EXIST_SPECIAL_CHAR(-13,"���������������������������"),
-    PASSWORD_EXIST_SPECIAL_CHAR(-14,"������������������������")
-
+    ACCOUNT_INVALID(-11,"���������������"),
+    PASSWORD_INVALID(-12,"������������"),
+    ACCOUNT_IS_EXPIRE(-13,"���������������")
     ;
     private final Integer code;
     private final String  msg;

--
Gitblit v1.8.0