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

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml

@@ -77,8 +77,8 @@
             staff_id,
             title,
             remind_time,
-            happened_time,
             DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName,
+            DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s')happenedTime,
             is_public,
             IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName",
             remark,