Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro i...

mk1990

2022-05-18 fe576c58384e0c1919af462ef5fc3ad8ea61da2e

 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java

@@ -31,7 +31,7 @@
    }

    @Override
    public void clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time) {
        deviceAlarmMapper.clearAlarmBeforeTime(id, deviceIdList, time);
    public int clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time) {
        return deviceAlarmMapper.clearAlarmBeforeTime(id, deviceIdList, time);
    }
}