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

doum

8 天以前 e8a0fd29e22c43c2146ffae0564ff03cbf0fc2c4

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