From 64264bb278bbfaa8df29f5f19a59d4e8345b04aa Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 七月 2025 09:59:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
index 96f133d..b8f54ad 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
@@ -24,6 +24,11 @@
private Long userid;
/**
+ * 商户id
+ */
+ private Long shopid;
+
+ /**
* 用户名
*/
private String username;
@@ -147,4 +152,12 @@
{
this.sysUser = sysUser;
}
+
+ public Long getShopid() {
+ return shopid;
+ }
+
+ public void setShopid(Long shopid) {
+ this.shopid = shopid;
+ }
}
--
Gitblit v1.7.1