diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index bf93b3b225..d16310d77c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -105,6 +105,11 @@ public class IcResiUserDTO implements Serializable { */ private String idCard; + /** + * 证件类型。烟台需求:来源于字典表dict_type=yt_id_card_type;1:身份证号;2:护照;3:港澳通行证;4:军人证;5:台胞证;6:其他 + */ + private String idCardType; + /** * 出生日期 */ @@ -125,6 +130,26 @@ public class IcResiUserDTO implements Serializable { */ private String contactsMobile; + /** + * 烟台需求:重点人群;名称对应字典表,dict_type:yt_key_point_user_type + */ + private String keyPointUserType; + + /** + * 烟台需求:国籍 + */ + private String nationality; + + /** + * 烟台需求:人口类型;名称对应字典表,dict_type:yt_population_type + */ + private String populationType; + + /** + * 烟台需求:政治面貌;名称对应字典表,dict_type:yt_politics_status + */ + private String politicsStatus; + /** * 九小场所url */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index a78fae885d..eda20ac933 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -102,7 +102,7 @@ public class IcResiUserEntity extends BaseEpmetEntity { private String idCard; /** - * 证件类型。1:身份证号;2:护照 + * 证件类型。烟台需求:来源于字典表dict_type=yt_id_card_type;1:身份证号;2:护照;3:港澳通行证;4:军人证;5:台胞证;6:其他 */ private String idCardType; @@ -126,7 +126,27 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String contactsMobile; - /** + /** + * 烟台需求:重点人群;名称对应字典表,dict_type:yt_key_point_user_type + */ + private String keyPointUserType; + + /** + * 烟台需求:国籍 + */ + private String nationality; + + /** + * 烟台需求:人口类型;名称对应字典表,dict_type:yt_population_type + */ + private String populationType; + + /** + * 烟台需求:政治面貌;名称对应字典表,dict_type:yt_politics_status + */ + private String politicsStatus; + + /** * 九小场所url */ private String ninePlace;