From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期一, 27 十二月 2021 10:08:13 +0800 Subject: [PATCH] Merge branch 'master' into hemenkou_dev --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java | 3 +++ 1 files changed, 3 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 f6ad674..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,6 +31,9 @@ @ApiModelProperty(value = "特殊人员标签") private String label; + @ApiModelProperty(value = "网格id") + private Long gridId; + private Integer outOrLocal; /** -- Gitblit v1.7.1