Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiS...

无关风月

2025-04-22 05310607f12eb6584c31f8cb91d01f8f15afa6c4

 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;

}