Merge branch 'dev' of https://gitee.com/luxiaotao1123/zy-asrs

luxiaotao1123

2020-07-11 8aef28e39575b910aa08c0c102c868d60fb306ea

 src/main/java/com/zy/system/entity/User.java

@@ -60,7 +60,7 @@
    private Date createTime;

    /**
     * 状态 1: 启用  2: 冻结  3: 删除  
     * 状态 1: 启用  0: 禁用
     */
    private Integer status;

@@ -154,10 +154,8 @@
        switch (this.status){
            case 1:
                return "启用";
            case 2:
                return "冻结";
            case 3:
                return "删除";
            case 0:
                return "禁用";
            default:
                return String.valueOf(this.status);
        }