From a5d99edd0a63cf23bec0d11b3606eaa0faab2849 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 20 May 2022 10:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=85=9A=E5=BB=BA?=
 =?UTF-8?q?=E5=B9=B3=E9=9D=A2=E5=9B=BE=E3=80=91=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2idCard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/VolunteerPolyListResultDTO.java  | 11 +++++++++++
 .../src/main/resources/mapper/IcVolunteerPolyDao.xml  |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyListResultDTO.java
index bd4376c771..fcbd7b7d9c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyListResultDTO.java
@@ -29,7 +29,18 @@ public class VolunteerPolyListResultDTO  implements Serializable {
      */
     private String mobile;
 
+    /**
+     * 用户id
+     */
     private String userId;
 
+    /**
+     * 关联表id
+     */
     private String icResiUser;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
index bcca166a47..35730fea52 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
@@ -48,7 +48,8 @@
             p.NAME,
             p.mobile,
             p.user_id,
-            p.IC_RESI_USER
+            p.IC_RESI_USER,
+            p.ID_CARD
         FROM
             ic_volunteer_poly p
             LEFT JOIN ic_volunteer_poly_category c ON p.ID_CARD = c.ID_CARD AND c.del_flag = '0'