From 54c4ea3d246763f9941bef0297c7561e5f0d0d15 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 04 十一月 2022 10:27:39 +0800
Subject: [PATCH] 修改bug

---
 ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index b40d47a..dee13d0 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.entity.depart.UmsDepart;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -45,7 +46,7 @@
     @ApiModelProperty(value = "閭")
     private String email;
 
-    @ApiModelProperty(value = "鐢ㄦ埛鍚嶏紙绯荤粺榛樿鐢熸垚锛�")
+    @ApiModelProperty(value = "鐪熷疄濮撳悕")
     private String nickName;
 
     @ApiModelProperty(value = "澶囨敞淇℃伅")
@@ -75,12 +76,11 @@
     @ApiModelProperty(value = "鑱屽姟")
     private String jobTitle;
 
-    @ApiModelProperty(value = "閮ㄩ棬id")
-    private Long departmentId;
-
     @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
     @TableField(exist = false)
     private String departName;
+
+
 
     @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
     private Byte userType;
@@ -91,7 +91,17 @@
     @ApiModelProperty(value = "鎵嬫満鍙风爜")
     private String mobile;
 
+    @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+    private Integer isGrid;
+
+    @ApiModelProperty(value = "鍏抽敭瀛楁")
+    @TableField(exist = false)
+    private String keyword;
+    @ApiModelProperty(value = "閮ㄩ棬")
+    @TableField(exist = false)
+    private UmsDepart depart;
     @ApiModelProperty(value = "瑙掕壊鍒楄〃")
     @TableField(exist = false)
     private List<UmsRole> roles;
+
 }

--
Gitblit v1.8.0