From 6f4ea76443679cfba04ff56337c4efe5e854c332 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 23 Apr 2020 15:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF-=E7=83=AD=E5=BF=83?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/warmhearted/result/ResiWarmAuditResultDTO.java     | 7 +++++--
 .../service/impl/ResiWarmheartedApplyServiceImpl.java      | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmAuditResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmAuditResultDTO.java
index ed9b877be7..8e00af9ca4 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmAuditResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmAuditResultDTO.java
@@ -97,7 +97,10 @@ public class ResiWarmAuditResultDTO implements Serializable {
      * 申请时间
      */
     private Date applyTime;
-
-
+    
+    /**
+     * 街道
+     */
+    private String street;
 
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index 46e9fcbe7e..b78ffa53eb 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -459,6 +459,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		resultDTO.setApplyTime(entity.getUpdatedTime());
 		resultDTO.setUserNickName(null == userInfo.getShowName() ? "" : userInfo.getShowName());
 		resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? "" : userInfo.getHeadPhoto());
+		resultDTO.setStreet(userInfo.getStreet());
 		return result.ok(resultDTO);
 	}
 }