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

zss

3 天以前 d5d089eff99cd51695697679a95445b6b5b0d205

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