Merge branch 'release/heart&tag' of http://121.42.41.42:7070/r/esua-epdc-cloud into release/heart&tag

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -226,6 +226,7 @@
         epdc_act_info actInfo
         left join epdc_act_user_relation relation on relation.DEL_FLAG = '0'
         and relation.USER_ID = #{userId}
+        and relation.STATUS != '3'
         and actInfo.ID = relation.ACT_ID
         LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID
         WHERE