Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-23 e2f232a6fc6404513ae53d69405d95d2eb9429ce

 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;

    /**
     * 数据权限
     */