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

无关风月

2025-04-17 a0eae3ecda7b70468c60a0079db6c4609c29939d

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -72,6 +72,10 @@
    @NotBlank(message = "请选择:账号所属角色")
    private Long roleId;

    @ApiModelProperty("所属加盟商id")
    @TableField("franchisee_id")
    private Integer franchiseeId;

    public SysUser() {
    }