Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2023-01-30 63c985f072826e7c82f51b0f415454a066fd8c56

 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -164,6 +164,12 @@
    @ApiModelProperty("角色id")
    private String roleIds;

     /**
     * 前端使用
     */
    @ApiModelProperty("前端使用")
    private String departmentIdStr;

    /**
     * 数据权限
     */