Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-04-29 3f62a93a0b0d64984cf070d0ca307a55faf95085

 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;

}