From a51b41110104ff43bbd716fddd3e44368256beef Mon Sep 17 00:00:00 2001
From: jiang <893224616@qq.com>
Date: 星期二, 19 七月 2022 18:13:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

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

diff --git a/src/main/java/com/genersoft/iot/vmp/service/IDeviceAlarmService.java b/src/main/java/com/genersoft/iot/vmp/service/IDeviceAlarmService.java
index 5e3f681..51e53d2 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IDeviceAlarmService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IDeviceAlarmService.java
@@ -38,6 +38,6 @@
      * @param deviceIdList 鍒跺畾闇�瑕佹竻鐞嗙殑璁惧id
      * @param time 涓嶅啓鏃堕棿鍒欐竻绌烘墍鏈夋椂闂寸殑
      */
-    void clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time);
+    int clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time);
 
 }

--
Gitblit v1.8.0