From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/system/domain/User.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 d5fa6fc..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
@@ -34,10 +34,6 @@
@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;
@@ -81,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