Merge remote-tracking branch 'origin/dev_optimize' into develop

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -196,7 +196,12 @@
             `NAME`,
             VILLAGE_ID AS neighborHoodId,
             BUILD_ID,
-            GRID_ID
+            GRID_ID,
+            MOBILE,
+            GENDER,
+            ID_CARD,
+            BIRTHDAY,
+            REMARKS
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))