From 9924db162a31e3f051cce0e3fb09d7c98e7641dc Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 9 Sep 2022 14:31:38 +0800
Subject: [PATCH 1/2] emm

---
 .../src/main/java/com/epmet/dto/result/PersonDataResultDTO.java | 2 ++
 .../src/main/resources/mapper/IcResiUserDao.xml                 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
index 68ad326637..5e739016b3 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
@@ -47,6 +47,8 @@ public class PersonDataResultDTO implements Serializable {
      * 姓名
      */
     private String name;
+    private String mobile;
+    private String isTenant;
 
     /**
      * 经济状况:包括 月收入：monthlyIncome  和  退休金额：retirementAmount
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 9373743976..b7a36c0456 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -310,6 +310,8 @@
             YSR,
             TXJE,
             ID_CARD,
+            MOBILE,
+            IS_TENANT,
             IFNULL(IS_VOLUNTEER,'0') AS isVolunteer,
             CUSTOMER_ID,
             GRID_ID

From 11a362654f02ca9773a941d6197cfdfe60ba6f27 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 9 Sep 2022 14:45:51 +0800
Subject: [PATCH 2/2] emm

---
 .../src/main/resources/mapper/IcResiUserDao.xml               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index b7a36c0456..7cb24ea51e 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -296,6 +296,8 @@
         <result column="ID_CARD" property="idCard"/>
         <result column="name" property="name"/>
         <result column="isVolunteer" property="isVolunteer"/>
+        <result column="mobile" property="mobile"/>
+        <result column="isTenant" property="isTenant"/>
         <result column="CUSTOMER_ID" property="customerId"/>
         <result column="GRID_ID" property="gridId"/>
         <collection property="financialSituation" ofType="com.epmet.dto.FinancialSituationDTO">
@@ -311,7 +313,7 @@
             TXJE,
             ID_CARD,
             MOBILE,
-            IS_TENANT,
+            IS_TENANT as isTenant,
             IFNULL(IS_VOLUNTEER,'0') AS isVolunteer,
             CUSTOMER_ID,
             GRID_ID