From 8aef28e39575b910aa08c0c102c868d60fb306ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 16:10:42 +0800
Subject: [PATCH] Merge branch 'dev' of https://gitee.com/luxiaotao1123/zy-asrs

---
 src/main/java/com/zy/system/entity/User.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index 7d1285f..4a818ef 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/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);
         }

--
Gitblit v1.9.1