From 0d6aae2036feb77bb2796f6b484489d7ffcd99c2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 10 五月 2024 22:19:25 +0800
Subject: [PATCH] 各bug修复
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 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 587e028..1a6fef4 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,13 +55,16 @@
@ApiModelProperty(value = "鐢佃瘽鍙风爜")
private String phone;
- @ValueTableShow(7)
@ApiModelProperty(value = "閮ㄩ棬")
private String department;
@ValueTableShow(8)
- @ApiModelProperty(value = "鍏徃")
+ @ApiModelProperty(value = "鍗曚綅")
private String company;
+
+ @ValueTableShow(8)
+ @ApiModelProperty(value = "鍗曚綅鍦板潃")
+ private String address;
@ApiModelProperty(value = "瑙掕壊涓婚敭")
private Integer roleId;
@@ -87,4 +89,27 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+ private Integer isCustom;
+
+ 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