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

rk

2 天以前 69758b26403c3c97ad35c2c76125a1ff36a3e9d0

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java

@@ -75,7 +75,7 @@

    List<AlarmEventDataVO> fightingAdminAlertList();

    AlarmDataVO alarmDataSumByCate();
    AlarmDataVO alarmDataSumByCate(Integer type);

    List<AlarmDataVO> fightingAlarmHandleData();