From fe576c58384e0c1919af462ef5fc3ad8ea61da2e Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期三, 18 五月 2022 16:58:26 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro 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