Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2021-09-07 407a5b77c3586fef44dc771e48f05c2354740795

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