From 66ae2020f8ea1e1f2573b46c668874180a483f3d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/UserShop.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/UserShop.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/UserShop.java
index 9a751e0..0f5133c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/UserShop.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/UserShop.java
@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.annotation.Excel;
import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
/**
* @author zhibing.pu
@@ -22,7 +26,7 @@
* 用户id
*/
@TableField("user_id")
- private Integer userId;
+ private Long userId;
/**
* 门店id
*/
@@ -37,5 +41,16 @@
* 角色id
*/
@TableField("role_id")
- private Integer roleId;
+ private Long roleId;
+
+ /** 部门ID */
+ @TableField("dept_id")
+ private Long deptId;
+
+ /** 用户昵称 */
+ @TableField("nick_name")
+ private String nickName;
+
+ @TableField("create_time")
+ private LocalDateTime createTime;
}
--
Gitblit v1.7.1