diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationDictConstant.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationDictConstant.java index 50226d8..fd78faa 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationDictConstant.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationDictConstant.java @@ -53,5 +53,16 @@ public interface PopulationDictConstant { */ String GENDER = "gender"; + /** + * 特殊人群 + */ + String SPECIAL_CROWD = "special_crowd"; + + /** + * 人口类型 + */ + String PEOPLE_CATEGORIES = "people_categories"; + + } diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseResidentDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseResidentDTO.java index 90da772..cebffc6 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseResidentDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseResidentDTO.java @@ -141,4 +141,10 @@ public class HouseResidentDTO implements Serializable { */ private String isEditResidentInfo; + /** + * 特殊人群 + */ + private String specialCrowd; + + private String peopleCategories; } \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java index 360f2ed..b0c42a5 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.dto.house; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -301,4 +302,9 @@ public class PopulationInformationDTO implements Serializable { */ private Integer vaccinationState; + /** + * 人口类型 + */ + private String peopleCategories; + } \ No newline at end of file