Merge remote-tracking branch 'refs/remotes/origin/dev_New' into jtwy

liyong

2026-02-04 69bb4a6479653f2e27cb67ce0ab817bd40e9c791

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