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

liyong

8 天以前 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

 src/main/java/com/ruoyi/common/enums/UserStatus.java

@@ -5,7 +5,7 @@
 * 

 * @author ruoyi

 */

public enum UserStatus

public enum UserStatus implements BaseEnum<String>

{

    OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");



@@ -23,8 +23,13 @@
        return code;

    }



    public String getValue() {

        return info;

    }



    public String getInfo()

    {

        return info;

    }



}