Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml

@@ -88,10 +88,10 @@
     <select id="hasAuthenticationPartyPage" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
         SELECT
         pm.CADRE_FLAG,
-        pm.CREATED_BY,pm.CREATED_TIME,
+        pm.CREATED_BY,user.CREATED_TIME,
         pm.DEPT_ID,
         pm.ID,pm.IDENTITY_NO,pm.MOBILE,pm.POST,
-        pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,pm.REGIST_TIME,
+        pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,user.REGISTER_TIME as registTime,
         pm.REVISION,
         GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME,
         pm.ALL_DEPT_NAMES as allDeptNames