From bce822c1cb336db7dad14e7dbc12f5a8a0fd656b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 15 五月 2024 15:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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 f123b20..6f4b5fb 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
@@ -37,8 +32,12 @@
private String password;
@ValueTableShow(2)
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ @ApiModelProperty(value = "濮撳悕")
private String name;
+
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "濮撳悕EN")
+ private String nameEn;
@ValueTableShow(3)
@ApiModelProperty(value = "鐘舵��")
@@ -56,7 +55,6 @@
@ApiModelProperty(value = "鐢佃瘽鍙风爜")
private String phone;
- @ValueTableShow(7)
@ApiModelProperty(value = "閮ㄩ棬")
private String department;
@@ -64,7 +62,7 @@
@ApiModelProperty(value = "鍗曚綅")
private String company;
- @ValueTableShow(8)
+ @ValueTableShow(14)
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
@@ -107,4 +105,33 @@
@ValueTableShow(value = 13,name = "鑷韩鐓х墖鍦板潃")
private String pictureUrl;
+ /**
+ * 缁勭粐
+ */
+// @ValueTableShow(value = 14,name = "缁勭粐")
+ @ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
+ private String departId;
+
+ ////浜哄憳缂栧彿锛屽叏灞�鍞竴
+// private String employeeID;
+////宀椾綅
+// private String position;
+////宀椾綅缂栫爜
+// private String positionCode;
+////鎵嬫満鍙风爜
+// private String phoneNumber;
+//
+// //鎬у埆 1:鐢� 2:濂�
+// private int gender;
+//
+// //缁勭粐鐘舵�� enable:鍦ㄨ亴 disabled:绂昏亴
+// private String status;
+////鎵�灞炵粍缁囩紪鐮�
+// private String companyId;
+////鍏徃閭(鍙敤浜庨偖绠辩郴缁�)
+// private String companyEmail;
+////鍏ヨ亴鍏徃鏃堕棿
+// private String dateOfJoiningTheCompany;
+////缁勭粐鍐呯殑閮ㄩ棬缂栫爜
+// private String departmentCode;
}
--
Gitblit v1.9.3