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

无关风月

2025-04-17 a0eae3ecda7b70468c60a0079db6c4609c29939d

 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;

}