Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java

@@ -21,7 +21,8 @@
    MOBILE_INVALID(-9,"手机号无效"),
    EMAIL_INVALID(-10,"邮箱无效"),
    ACCOUNT_INVALID(-11,"用户名无效"),
    PASSWORD_INVALID(-12,"密码无效")
    PASSWORD_INVALID(-12,"密码无效"),
    ACCOUNT_IS_EXPIRE(-13,"用户已过期")
    ;
    private final Integer code;
    private final String  msg;