From 33b2b3a0e697e1bdb804a37de800b0471dfb0cef Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 28 九月 2022 20:28:55 +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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 67edecf..6847959 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
@@ -1,6 +1,7 @@
package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -30,6 +31,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
private String username;
private String password;
@@ -64,20 +66,24 @@
@ApiModelProperty(value = "鏄惁鍏氬憳")
private byte isDy;
+ @ApiModelProperty(value = "鎬у埆")
+ private byte sex;
+
@ApiModelProperty(value = "鑱屽姟")
private String jobTitle;
@ApiModelProperty(value = "閮ㄩ棬id")
private Long departmentId;
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String departName;
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
private byte userType;
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
-
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
- private String realName;
@ApiModelProperty(value = "鎵嬫満鍙风爜")
private String mobile;
--
Gitblit v1.8.0