Merge remote-tracking branch 'origin/dev_New' into hsxny-new

maven

9 天以前 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025

 src/main/java/com/ruoyi/common/constant/UserConstants.java

@@ -21,6 +21,9 @@
    /** 用户封禁状态 */

    public static final String USER_DISABLE = "1";



    /** 角色正常状态 */

    public static final String ROLE_NORMAL = "0";



    /** 角色封禁状态 */

    public static final String ROLE_DISABLE = "1";