From 4f3fd6c40cf8ff706f86363ccd6555164f348d63 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Jun 2020 10:37:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/AlarmService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/AlarmService.java b/src/main/java/com/moral/service/AlarmService.java
index c16ebe8..887b95e 100644
--- a/src/main/java/com/moral/service/AlarmService.java
+++ b/src/main/java/com/moral/service/AlarmService.java
@@ -5,7 +5,7 @@
 
 public interface AlarmService {
 
-    List<Map<String, Object>> getAvgAlarmData(Map<String,Object> devices);
+    List<Map<String, Object>> getAlarmData();
 
     int insertAlarmDaily(List<Map<String,Object>> list);
 

--
Gitblit v1.8.0