From fa0660291055ec113f9982270c27ebc45bec16ce Mon Sep 17 00:00:00 2001
From: xingqiao <xingqiao@uni-ubi.com>
Date: 星期五, 26 八月 2022 11:53:28 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/ixingqiao/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java | 1 -
1 files changed, 0 insertions(+), 1 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 ead291c..8c55986 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
@@ -17,7 +17,6 @@
@Autowired
private DeviceAlarmMapper deviceAlarmMapper;
-
@Override
public PageInfo<DeviceAlarm> getAllAlarm(int page, int count, String deviceId, String alarmPriority, String alarmMethod, String alarmType, String startTime, String endTime) {
PageHelper.startPage(page, count);
--
Gitblit v1.8.0