From b5ce09beb38e05832bdbcbe3885d3baad756c425 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Tue, 19 Nov 2019 09:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/EpdcAppUserController.java | 4 ++--
 .../epdc-user-server/src/main/resources/mapper/UserDao.xml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
index 7f906cc4c..c2b9dfe40 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
@@ -266,8 +266,8 @@ public class EpdcAppUserController {
      * @param userId
      * @return
      */
-    @GetMapping("partyMemberDetail")
-    public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId){
+    @GetMapping("partyMemberDetail/{userId}")
+    public Result<EpdcPartyMemberDetailDto> partyMemberDetail(@PathVariable("userId") String userId){
         return userService.partyMemberDetail(userId);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 47e93aaf5..85c656293 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -168,7 +168,7 @@
         <result column="gridName" property="gridName" />
         <result column="partyFlag" property="partyFlag" />
         <result column="cadreFlag" property="cadreFlag" />
-        <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDto" >
+        <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO" >
             <result column="completeName" property="completeName"/>
             <result column="leaderFlag" property="leaderFlag"/>
         </collection>
@@ -207,7 +207,7 @@
             AND eptr.DEL_FLAG = '0'
             AND eu.ID = #{userId}
     </select>
-    
+
     <select id="partyMemberDetailFaild" resultMap="partMemberDetail">
         SELECT
             eu.ID AS userId,