From 05c569f74a1c94b84145abe34f2b2385d68fdec6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 01:21:54 +0800
Subject: [PATCH] 实现人员管理

---
 user-server/src/main/java/com/yuanchu/mom/pojo/User.java |   42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index e4817dc..bc8bf1a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yuanchu.mom.annotation.ValueTableShow;
 import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,11 +11,7 @@
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.lang.reflect.Field;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 @Data
 @Builder
@@ -29,26 +24,27 @@
     @TableId(type = IdType.AUTO)
     private Integer id;
 
-    @ValueTableShow(1)
+    @ValueTableShow(2)
     @ApiModelProperty(value = "璐﹀彿")
     private String account;
 
     @ApiModelProperty(value = "瀵嗙爜")
     private String password;
 
-    @ValueTableShow(2)
-    @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+    @ValueTableShow(1)
+    @ApiModelProperty(value = "濮撳悕")
     private String name;
+
+    @ApiModelProperty(value = "濮撳悕EN")
+    private String nameEn;
 
     @ValueTableShow(3)
     @ApiModelProperty(value = "鐘舵��")
     private Integer state;
 
-    @ValueTableShow(4)
     @ApiModelProperty(value = "骞撮緞")
     private Integer age;
 
-    @ValueTableShow(5)
     @ApiModelProperty(value = "閭")
     private String email;
 
@@ -56,28 +52,23 @@
     @ApiModelProperty(value = "鐢佃瘽鍙风爜")
     private String phone;
 
-    @ValueTableShow(7)
     @ApiModelProperty(value = "閮ㄩ棬")
     private String department;
 
-    @ValueTableShow(8)
     @ApiModelProperty(value = "鍗曚綅")
     private String company;
 
-    @ValueTableShow(8)
     @ApiModelProperty(value = "鍗曚綅鍦板潃")
     private String address;
 
     @ApiModelProperty(value = "瑙掕壊涓婚敭")
     private Integer roleId;
 
-    @ValueTableShow(9)
     @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ValueTableShow(10)
     @ApiModelProperty(value = "鏇存柊鏃ユ湡")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -93,4 +84,25 @@
 
     private Integer isCustom;
 
+    private String code;
+
+    /**
+     * 绛惧悕鐓х墖鍦板潃
+     */
+    private String signatureUrl;
+
+    /**
+     * 鑷韩鐓х墖鍦板潃
+     */
+    private String pictureUrl;
+
+    /**
+     * 缁勭粐
+     */
+    @ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
+    private String departId;
+
+    @ApiModelProperty(value = "LIMS鍏宠仈鐨勯儴闂╥d")
+    private String departLimsId;
+
 }

--
Gitblit v1.9.3