Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

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

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

    private Integer outOrLocal;

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

}