From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +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 | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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..b40d47a 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,15 +1,16 @@
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;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -23,6 +24,9 @@
@EqualsAndHashCode(callSuper = false)
@TableName("ums_admin")
@ApiModel(value = "UmsAdmin瀵硅薄", description = "鍚庡彴鐢ㄦ埛琛�")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
public class UmsAdmin implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,6 +34,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
private String username;
private String password;
@@ -62,7 +67,10 @@
private String ipAddress;
@ApiModelProperty(value = "鏄惁鍏氬憳")
- private byte isDy;
+ private Byte isDy;
+
+ @ApiModelProperty(value = "鎬у埆")
+ private Byte sex;
@ApiModelProperty(value = "鑱屽姟")
private String jobTitle;
@@ -70,15 +78,20 @@
@ApiModelProperty(value = "閮ㄩ棬id")
private Long departmentId;
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String departName;
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
- private byte userType;
+ private Byte userType;
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
- private String realName;
-
@ApiModelProperty(value = "鎵嬫満鍙风爜")
private String mobile;
+
+ @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @TableField(exist = false)
+ private List<UmsRole> roles;
}
--
Gitblit v1.8.0