Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0

648540858

2022-03-04 ee746e53cda8e35ede1d966b582160caeb1ca562

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