Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-16 b4c810707d70a7e5c72595d1e62ddaaa81d8eef2

 flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java

@@ -29,7 +29,7 @@
    @ApiModelProperty("分类id父id")
    private Integer parentClassifyId;

    @ApiModelProperty("搜索数据类型1.办事部门2.办事指南 3.推荐办事指南4.分类")
    @ApiModelProperty("搜索数据类型1.办事部门2.办事指南 3.推荐办事指南4.分类 5.政策文件 6.法律法规")
    private  Integer type;

    @ApiModelProperty("办事指南")