From 0cbb1c4bc98c29e5ca73961d040a0ec1ca4333ac Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 22 四月 2025 09:07:53 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java index e846aaf..1efcafa 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java @@ -86,4 +86,8 @@ @TableField(exist = false) private Integer roleId; + @ApiModelProperty("所属加盟商id") + @TableField("franchisee_id") + private Integer franchiseeId; + } -- Gitblit v1.7.1