From a0801ab3f16bd3d967c220c5925ad02673ce1baa Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 15:24:16 +0800
Subject: [PATCH] 骑手微信登录
---
oying-system/src/main/java/com/oying/modules/system/domain/User.java | 28 ++++++++++++----------------
1 files changed, 12 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 900eb83..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
@@ -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;
@@ -34,17 +34,12 @@
@ApiModelProperty(value = "用户角色")
private Set<Role> roles;
- @TableField(exist = false)
- @ApiModelProperty(value = "用户岗位")
- private Set<Job> jobs;
+ @NotBlank
+ @ApiModelProperty(value = "用户类型(BUYER、MERCHANT、RIDER、ADMIN、SUPPLIER、AGENT)")
+ private String userType;
- @TableField(value = "dept_id")
- @ApiModelProperty(hidden = true)
- private Long deptId;
-
- @ApiModelProperty(value = "用户机构")
- @TableField(exist = false)
- private Dept dept;
+ @ApiModelProperty(value = "openid")
+ private String openid;
@NotBlank
@ApiModelProperty(value = "用户名称")
@@ -54,19 +49,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)
@@ -85,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