Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

2026-07-15 7be2d271eafa48f7e7dcc8ac9d2219634b5938ef

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