From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持

---
 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
old mode 100644
new mode 100755
index 5e3f681..51e53d2
--- 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