Merge branch 'dev_0906_new_demand'

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

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">
@@ -310,6 +312,8 @@
             YSR,
             TXJE,
             ID_CARD,
+            MOBILE,
+            IS_TENANT as isTenant,
             IFNULL(IS_VOLUNTEER,'0') AS isVolunteer,
             CUSTOMER_ID,
             GRID_ID