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

maven

3 天以前 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d

 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";