From c7b0737836cb0d0c702106795e3b35f0171deac2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 6 May 2023 20:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=B1=85=E6=B0=91=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4?=
 =?UTF-8?q?=E3=80=81=E5=9B=BD=E7=B1=8D=E3=80=81=E4=BA=BA=E5=8F=A3=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=95=B4=E6=B2=BB=E9=9D=A2=E8=B2=8C=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcResiUserDTO.java     | 25 +++++++++++++++++++
 .../com/epmet/entity/IcResiUserEntity.java    | 24 ++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

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;