Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

101captain

2021-12-29 c0116d3fa128713d8466dbdf952fb61a64adc0b9

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

@@ -31,6 +31,9 @@
    @ApiModelProperty(value = "特殊人员标签")
    private String label;

    @ApiModelProperty(value = "网格id")
    private Long gridId;

    private Integer outOrLocal;

    /**