Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-11-08 947d016e4bd349b78d540e3a869f55d68b2c610c

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

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

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

    private Integer outOrLocal;

    /**
     * 外地or本地（1.本地  2.外地）
     */
    public interface outOrLocal{
        int bd = 1;
        int wd = 2;
    }

}