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

liyong

昨天 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d

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