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

无关风月

10 天以前 f39e7de8be43eda95560f49982b6cd0345e24404

 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;

}