From bdbcc02f55015536570710eaa62b3dc49cba981e Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 27 May 2022 14:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java  | 5 +++++
 .../src/main/resources/mapper/IcVolunteerPolyDao.xml         | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java
index 7ec767f92c..1665ebdb65 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java
@@ -71,4 +71,9 @@ public class VolunteerPolyMapDataResultDTO implements Serializable {
      * 类别
      */
     private String volunteerCategory;
+
+    /**
+     * 居民id
+     */
+    private String icResiUser;
 }
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 bf3d3acbea..832904136e 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
@@ -42,7 +42,8 @@
             u.HOME_ID,
             p.LONGITUDE,
             p.LATITUDE,
-            c.VOLUNTEER_CATEGORY
+            c.VOLUNTEER_CATEGORY,
+            p.IC_RESI_USER
         FROM
             ic_volunteer_poly p
             LEFT JOIN ic_resi_user u ON p.IC_RESI_USER = u.id and u.DEL_FLAG = '0'