From d7bfd9bfa7af26d6c76fe771bb8cfe0d3f84da5e Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期四, 21 四月 2022 10:30:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into map

---
 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java
index 0567b55..ead291c 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java
+++ b/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);
     }
 }

--
Gitblit v1.8.0