From 982313135d1c239fe3b20e4c5664781f92d40aca Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:17:39 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/system/domain/User.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 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 17f7b64..7199747 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
@@ -9,7 +9,6 @@
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;
@@ -35,18 +34,6 @@
@ApiModelProperty(value = "用户角色")
private Set<Role> roles;
- @TableField(exist = false)
- @ApiModelProperty(value = "用户岗位")
- private Set<Job> jobs;
-
- @TableField(value = "dept_id")
- @ApiModelProperty(hidden = true)
- private Long deptId;
-
- @ApiModelProperty(value = "用户机构")
- @TableField(exist = false)
- private Dept dept;
-
@NotBlank
@ApiModelProperty(value = "用户类型(BUYER、MERCHANT、RIDER、ADMIN、SUPPLIER、AGENT)")
private String userType;
@@ -62,12 +49,9 @@
@ApiModelProperty(value = "用户昵称")
private String nickName;
- @Email
- @NotBlank
@ApiModelProperty(value = "邮箱")
private String email;
- @NotBlank
@ApiModelProperty(value = "电话号码")
private String phone;
@@ -93,6 +77,10 @@
@ApiModelProperty(value = "最后修改密码的时间", hidden = true)
private Date pwdResetTime;
+ @ApiModelProperty(value = "骑手openid")
+ private String riderOpenId;
+
+
@Override
public boolean equals(Object o) {
if (this == o) {
--
Gitblit v1.9.3