Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

hotcoffie

2022-05-07 ec8ab540f8af6dca862d3ec9967e9042fa7dd8eb

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