Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-09 06ceee5a4f820ebb19dd66388c958d8638fa1b54

 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;

    /**