From e739a69ee991bac72c50bd8c7a00468bcd8039a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 16:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 1c92a00..1df4d80 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -43,6 +43,9 @@
// 站点id
@TableField("site_id")
private Integer siteId;
+ // 站点id
+ @TableField("open_id")
+ private String openId;
// 积分
@TableField("integral")
private Integer integral;
@@ -123,7 +126,7 @@
/**
* 角色类型 1=平台 2=门店
*/
- @ApiModelProperty(value = "角色类型 1=平台 2=门店")
+ @ApiModelProperty(value = "角色类型 1=平台 2=站点")
@TableField("role_type")
private Integer roleType;
--
Gitblit v1.7.1