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

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

@@ -198,10 +198,14 @@
             BUILD_ID,
             GRID_ID,
             MOBILE,
-            GENDER,
+            ( case when GENDER='1'then '男'
+             when GENDER='2' then '女'
+             else '未知'
+             end
+            ) as GENDER,
             ID_CARD,
-            BIRTHDAY,
+            IFNULL(BIRTHDAY,'') AS BIRTHDAY,
-            REMARKS
+            IFNULL(REMARKS,'') AS REMARKS
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))