From 9283fa6e32145ff0ae237c40d2008fc35e81ef7c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java | 17 +++++++++++++++++
1 files changed, 17 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 af404f6..088eb9e 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
@@ -4,6 +4,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.List;
import java.util.Set;
/**
@@ -56,6 +57,22 @@
private String role;
/**
+ * 角色id
+ */
+ private Long roleId;
+
+ /**
+ * 登录账号是否为加盟商
+ */
+ private Boolean isFranchisee;
+
+ /**
+ * 加盟商所管辖城市
+ * 城市code列表
+ */
+ private List<String> cityList;
+
+ /**
* 用户信息
*/
private SysUser sysUser;
--
Gitblit v1.7.1