From 899e021604c2dc1660fe9b240f041f7bef56563b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 28 十月 2022 15:08:08 +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 | 15 ++++++++++-----
1 files changed, 10 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 ed0eee0..af59e8f 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.*;
@@ -75,15 +76,16 @@
@ApiModelProperty(value = "鑱屽姟")
private String jobTitle;
- @ApiModelProperty(value = "閮ㄩ棬id")
- private Long departmentId;
-
@ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
@TableField(exist = false)
private String departName;
+ @ApiModelProperty(value = "閮ㄩ棬id")
+ @TableField(exist = false)
+ private Integer departmentId;
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
- private Byte userType;
+ private Integer userType;
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
@@ -94,8 +96,11 @@
@ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
private Integer isGrid;
-
+ @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @TableField(exist = false)
+ private UmsDepart depart;
@ApiModelProperty(value = "瑙掕壊鍒楄〃")
@TableField(exist = false)
private List<UmsRole> roles;
+
}
--
Gitblit v1.8.0