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

doum

昨天 ba173949df6bf3f0a5a39e04e8265cd43c9cede4

 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();