Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianH...

luodangjia

2025-01-08 d34b3987a7c89c29a74eb7d3525b2a486eeaca10

 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;

}