Merge branch 'dev_New_pro' into dev_天津_宝东pro

云

2026-05-15 3a941e0fc821d879d5f17b41dfc6d9c7688862dc

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