From ad42a81e625f1e7a982a94994d7d5f3314c71fbd Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 15 Nov 2017 14:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
index 4a097f7..130719e 100644
--- a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
+++ b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
@@ -14,5 +14,5 @@
 
 	List<Map<String, Object>> getEquipmentStates(Map<String, Object> parameters); 
 
-	String getMacLogByLast(); 
+	List<Map<String, Object>> getSensorsAverageByEquipment(Map<String, Object> parameters);
 }
\ No newline at end of file

--
Gitblit v1.8.0