Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-23 1d16cf86e7cff1f754576620aa27370b91df0004

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationExportDTO.java

@@ -46,4 +46,8 @@
    @ApiModelProperty(value = "人口id集合")
    private List<Long> populationIds;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "社区id", hidden = true, example = "1")
    private Long communityId;

}