From c81a5b4f6c18f01059a5012ce436f079a1ff840a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 04 三月 2023 13:31:21 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 efdacf7..dff07d7 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
@@ -80,9 +80,7 @@
@TableField(exist = false)
private String departName;
- @ApiModelProperty(value = "閮ㄩ棬id")
- @TableField(exist = false)
- private String departmentId;
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
private Integer userType;
@@ -96,9 +94,12 @@
@ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
private Integer isGrid;
- @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @ApiModelProperty(value = "鍏抽敭瀛楁")
@TableField(exist = false)
- private UmsDepart depart;
+ private String keyword;
+ @ApiModelProperty(value = "閮ㄩ棬")
+ @TableField(exist = false)
+ private List<UmsDepart> depart;
@ApiModelProperty(value = "瑙掕壊鍒楄〃")
@TableField(exist = false)
private List<UmsRole> roles;
--
Gitblit v1.8.0