Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子Li

2022-05-28 5ced7e05f592ba23f585fc5a2b43ea8695ac0ff8

 ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

@@ -23,11 +23,21 @@
    String EXCEPTION = "1";

    /**
     * 用户正常状态
     */
    String USER_NORMAL = "0";

    /**
     * 用户封禁状态
     */
    String USER_DISABLE = "1";

    /**
     * 角色正常状态
     */
    String ROLE_NORMAL = "0";

    /**
     * 角色封禁状态
     */
    String ROLE_DISABLE = "1";