From b6f11e1b2c756defa92a19fbbfa67e9135bf6bbf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Jun 2022 09:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/CollectListResultDTO.java | 14 ++++++++++++++
 .../src/main/resources/mapper/IcResiCollectDao.xml |  5 ++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
index f4bd2a1886..6a23e0cc1c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
@@ -73,10 +73,24 @@ public class CollectListResultDTO implements Serializable {
          */
         private String domicilePlace;
 
+        /**
+         * 户籍所在地行政地区编码
+         */
+        private String domicilePlaceCode;
+
+        /**
+         * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203
+         */
+        private String domicilePlaceCodePath;
+
         /**
          * 学校或公司
          */
         private String workPlace;
 
+        /**
+         * 备注
+         */
+        private String remark;
     }
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
index 9820bdf7d4..1269859264 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
@@ -56,7 +56,10 @@
             m.HE_SUAN_COUNT AS heSuanCount,
             m.YMJZ AS ymjz,
             m.DOMICILE_PLACE as domicilePlace,
-            m.WORK_PLACE as workPlace
+            m.DOMICILE_PLACE_CODE as domicilePlaceCode,
+            m.DOMICILE_PLACE_CODE_PATH as domicilePlaceCodePath,
+            m.WORK_PLACE as workPlace,
+            m.REMARK as remark
         from ic_resi_member m
         where m.DEL_FLAG = 0
         and m.IC_RESI_COLLECT_ID = #{id}