From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/User.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/User.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/User.java
index 84a6e4c..044a627 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/User.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/User.java
@@ -24,16 +24,20 @@
@ApiModel(value = "User对象", description = "用户列表")
public class User extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("用户id")
@TableField("user_no")
private String userNo;
- @ApiModelProperty("注册城市id")
- @TableField("city_id")
- private Integer cityId;
+ @ApiModelProperty("注册城市")
+ @TableField("city")
+ private String city;
+
+ @ApiModelProperty("城市编码")
+ @TableField("city_code")
+ private String cityCode;
@ApiModelProperty("用户昵称")
@TableField("nickname")
@@ -51,4 +55,8 @@
@TableField("state")
private Integer state;
+ @ApiModelProperty("微信OpenId")
+ @TableField("open_id")
+ private String openId;
+
}
--
Gitblit v1.7.1