Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop

zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml

@@ -124,6 +124,7 @@
         LEFT JOIN (   SELECT    mark.section_id,   COUNT(1) AS number  FROM   dc_warning AS w  JOIN
         dc_stake_mark AS mark ON mark.stake_mark = w.stake_mark AND mark.direction = w.direction
         WHERE    mark.stake_mark IS NOT NULL    AND DATE_FORMAT(w.warning_time, '%Y-%m-%d') = DATE_FORMAT(#{warningTime}, '%Y-%m-%d')
+        and w.warning_source!=6
         GROUP BY   mark.section_id  ) AS w_count ON s.id = w_count.section_id
         ORDER BY    number DESC;
     </select>