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

无关风月

2025-04-22 4010eccfd7a6e0f79041f9cb051c7f9d09bfdedc

 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() {
    }