From 9b1acfe1b5786a3a3e3e849a5729d68fa05c3a1a Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期一, 28 十一月 2022 13:19:56 +0800 Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java index 5c6d14b..b4abb0b 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java +++ b/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; + } + } -- Gitblit v1.7.1