From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化

---
 ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java |   76 +++++++++++++++++++++++++++++++++++--
 1 files changed, 71 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 1494867..39505fe 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,21 @@
 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 com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ycl.entity.depart.UmsDepart;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+import org.joda.time.DateTime;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -22,14 +28,18 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("ums_admin")
-@ApiModel(value="UmsAdmin瀵硅薄", description="鍚庡彴鐢ㄦ埛琛�")
+@ApiModel(value = "UmsAdmin瀵硅薄", description = "鍚庡彴鐢ㄦ埛琛�")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class UmsAdmin implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
     private String username;
 
     private String password;
@@ -40,7 +50,7 @@
     @ApiModelProperty(value = "閭")
     private String email;
 
-    @ApiModelProperty(value = "鏄电О")
+    @ApiModelProperty(value = "鐪熷疄濮撳悕")
     private String nickName;
 
     @ApiModelProperty(value = "澶囨敞淇℃伅")
@@ -52,8 +62,64 @@
     @ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
     private Date loginTime;
 
+    @ApiModelProperty(value = "璐﹀彿鏈夋晥鏈�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expirationDate;
+
     @ApiModelProperty(value = "甯愬彿鍚敤鐘舵�侊細0->绂佺敤锛�1->鍚敤")
     private Integer status;
 
+    @ApiModelProperty(value = "mac鍦板潃")
+    private String macAddress;
+
+    @ApiModelProperty(value = "ip鍦板潃")
+    private String ipAddress;
+
+    @ApiModelProperty(value = "鏄惁鍏氬憳")
+    private Byte isDy;
+
+    @ApiModelProperty(value = "鎬у埆")
+    private Byte sex;
+
+    @ApiModelProperty(value = "鑱屽姟")
+    private String jobTitle;
+
+    @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+    @TableField(exist = false)
+    private String departName;
+
+
+    @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
+    private Integer userType;
+
+    @ApiModelProperty(value = "搴ф満/鍒嗘満")
+    private String zj;
+
+    @ApiModelProperty(value = "鎵嬫満鍙风爜")
+    private String mobile;
+
+    @ApiModelProperty(value = "搴旂敤+鐢ㄦ埛鍞�旀爣璇�")
+    private String openid;
+
+    @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+    private Integer isGrid;
+
+    @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+    @TableField("password_error_num")
+    private Integer passwordErrorNum;
+
+    @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+    @TableField("password_error_last_time")
+    private LocalDateTime passwordErrorLastTime;
+
+    @ApiModelProperty(value = "鍏抽敭瀛楁")
+    @TableField(exist = false)
+    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