From 0c03b83cc8e26963275d9ef16ea476ecdc035a0d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 09 五月 2024 13:16:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 5b50345..fa96e20 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;
@@ -95,4 +93,23 @@
private String code;
+ /**
+ * 绛惧悕鐓х墖鍦板潃
+ */
+ @ValueTableShow(value = 12,name = "绛惧悕鐓х墖鍦板潃")
+ private String signatureUrl;
+
+ /**
+ * 鑷韩鐓х墖鍦板潃
+ */
+ @ValueTableShow(value = 13,name = "鑷韩鐓х墖鍦板潃")
+ private String pictureUrl;
+
+ /**
+ * 缁勭粐
+ */
+// @ValueTableShow(value = 14,name = "缁勭粐")
+ @ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
+ private String departId;
+
}
--
Gitblit v1.9.3