From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 18 二月 2025 17:58:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java | 12 ++++++++++++ 1 files changed, 12 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 3be5572..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; /** @@ -61,6 +62,17 @@ private Long roleId; /** + * 登录账号是否为加盟商 + */ + private Boolean isFranchisee; + + /** + * 加盟商所管辖城市 + * 城市code列表 + */ + private List<String> cityList; + + /** * 用户信息 */ private SysUser sysUser; -- Gitblit v1.7.1