From 29bf89e3f30c1aaa09b34b1a2b9c572d3c070e29 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 07 Jul 2025 20:05:16 +0800
Subject: [PATCH] 退货原因状态

---
 oying-system/src/main/java/com/oying/modules/system/domain/User.java |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/User.java b/oying-system/src/main/java/com/oying/modules/system/domain/User.java
index 900eb83..d5fa6fc 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/User.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/User.java
@@ -8,7 +8,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import com.oying.base.BaseEntity;
-import javax.validation.constraints.Email;
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -26,7 +26,7 @@
 public class User extends BaseEntity implements Serializable {
 
     @NotNull(groups = Update.class)
-    @TableId(value="user_id", type = IdType.AUTO)
+    @TableId(value = "user_id", type = IdType.AUTO)
     @ApiModelProperty(value = "ID", hidden = true)
     private Long id;
 
@@ -38,13 +38,12 @@
     @ApiModelProperty(value = "用户岗位")
     private Set<Job> jobs;
 
-    @TableField(value = "dept_id")
-    @ApiModelProperty(hidden = true)
-    private Long deptId;
+    @NotBlank
+    @ApiModelProperty(value = "用户类型(BUYER、MERCHANT、RIDER、ADMIN、SUPPLIER、AGENT)")
+    private String userType;
 
-    @ApiModelProperty(value = "用户机构")
-    @TableField(exist = false)
-    private Dept dept;
+    @ApiModelProperty(value = "openid")
+    private String openid;
 
     @NotBlank
     @ApiModelProperty(value = "用户名称")
@@ -54,19 +53,16 @@
     @ApiModelProperty(value = "用户昵称")
     private String nickName;
 
-    @Email
-    @NotBlank
     @ApiModelProperty(value = "邮箱")
     private String email;
 
-    @NotBlank
     @ApiModelProperty(value = "电话号码")
     private String phone;
 
     @ApiModelProperty(value = "用户性别")
     private String gender;
 
-    @ApiModelProperty(value = "头像真实名称",hidden = true)
+    @ApiModelProperty(value = "头像真实名称", hidden = true)
     private String avatarName;
 
     @ApiModelProperty(value = "头像存储的路径", hidden = true)

--
Gitblit v1.9.3