From c4dd042be2033c924a1d6d8f67544863f2a395fa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 7 May 2023 09:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AFic=5Fresi?=
 =?UTF-8?q?=5Fuser=E5=A2=9E=E5=8A=A0=E6=88=B7=E7=B1=8D=E3=80=81=E5=B1=85?=
 =?UTF-8?q?=E4=BD=8F=E7=AD=8921=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcResiUserDTO.java     | 105 ++++++++++++++++++
 .../com/epmet/entity/IcResiUserEntity.java    | 105 ++++++++++++++++++
 2 files changed, 210 insertions(+)

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 31a6740e6b..62541c7469 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
@@ -440,6 +440,111 @@ public class IcResiUserDTO implements Serializable {
      */
 	private String rhzk;
 
+    /**
+     * 烟台需求：是否现居住；0否；1是，对应字典表dict_type:
+     */
+    private String isNowLive;
+
+    /**
+     * 烟台需求：居住省
+     */
+    private String livingProvince;
+
+    /**
+     * 烟台需求：居住市
+     */
+    private String livingCity;
+
+    /**
+     * 烟台需求：居住区
+     */
+    private String livingArea;
+
+    /**
+     * 烟台需求：居住街道
+     */
+    private String livingStreet;
+
+    /**
+     * 烟台需求：居住社区
+     */
+    private String livingCommunity;
+
+    /**
+     * 烟台需求：居住小区
+     */
+    private String livingViliageName;
+
+    /**
+     * 烟台需求：居住楼号
+     */
+    private String livingBuildingNo;
+
+    /**
+     * 烟台需求：居住单元号
+     */
+    private String livingUnitNo;
+
+    /**
+     * 烟台需求：居住房间号
+     */
+    private String livingHouseNo;
+
+    /**
+     * 烟台需求：户籍所在省
+     */
+    private String registerProvince;
+
+    /**
+     * 烟台需求：户籍所在市
+     */
+    private String registerCity;
+
+    /**
+     * 烟台需求：户籍所在区县
+     */
+    private String registerArea;
+
+    /**
+     * 烟台需求：户籍所在街道
+     */
+    private String registerStreet;
+
+    /**
+     * 烟台需求：户籍所在社区
+     */
+    private String registerCommunity;
+
+    /**
+     * 烟台需求：户籍所在小区名称
+     */
+    private String registerViliageName;
+
+    /**
+     * 烟台需求：户籍楼号
+     */
+    private String registerBuildingNo;
+
+    /**
+     * 烟台需求：户籍单元号
+     */
+    private String registerUnitNo;
+
+    /**
+     * 烟台需求：户籍房间号
+     */
+    private String registerHouseNo;
+
+    /**
+     * 烟台需求：户别；对应字典表dict_type:yt_household_category
+     */
+    private String householdCategory;
+
+    /**
+     * 烟台需求：户号
+     */
+    private String houseHoldId;
+
     /**
      * 居住信息备注
      */
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 427d18a897..961f69dfe9 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
@@ -430,6 +430,111 @@ public class IcResiUserEntity extends BaseEpmetEntity {
      */
 	private String rhzk;
 
+	/**
+	 * 烟台需求：是否现居住；0否；1是，对应字典表dict_type:
+	 */
+	private String isNowLive;
+
+	/**
+	 * 烟台需求：居住省
+	 */
+	private String livingProvince;
+
+	/**
+	 * 烟台需求：居住市
+	 */
+	private String livingCity;
+
+	/**
+	 * 烟台需求：居住区
+	 */
+	private String livingArea;
+
+	/**
+	 * 烟台需求：居住街道
+	 */
+	private String livingStreet;
+
+	/**
+	 * 烟台需求：居住社区
+	 */
+	private String livingCommunity;
+
+	/**
+	 * 烟台需求：居住小区
+	 */
+	private String livingViliageName;
+
+	/**
+	 * 烟台需求：居住楼号
+	 */
+	private String livingBuildingNo;
+
+	/**
+	 * 烟台需求：居住单元号
+	 */
+	private String livingUnitNo;
+
+	/**
+	 * 烟台需求：居住房间号
+	 */
+	private String livingHouseNo;
+
+	/**
+	 * 烟台需求：户籍所在省
+	 */
+	private String registerProvince;
+
+	/**
+	 * 烟台需求：户籍所在市
+	 */
+	private String registerCity;
+
+	/**
+	 * 烟台需求：户籍所在区县
+	 */
+	private String registerArea;
+
+	/**
+	 * 烟台需求：户籍所在街道
+	 */
+	private String registerStreet;
+
+	/**
+	 * 烟台需求：户籍所在社区
+	 */
+	private String registerCommunity;
+
+	/**
+	 * 烟台需求：户籍所在小区名称
+	 */
+	private String registerViliageName;
+
+	/**
+	 * 烟台需求：户籍楼号
+	 */
+	private String registerBuildingNo;
+
+	/**
+	 * 烟台需求：户籍单元号
+	 */
+	private String registerUnitNo;
+
+	/**
+	 * 烟台需求：户籍房间号
+	 */
+	private String registerHouseNo;
+
+	/**
+	 * 烟台需求：户别；对应字典表dict_type:yt_household_category
+	 */
+	private String householdCategory;
+
+	/**
+	 * 烟台需求：户号
+	 */
+	private String houseHoldId;
+
     /**
      * 居住信息备注
      */