From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
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