From b8e86e2b44b796ced6f8fa557dfee532749dcc6c Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Wed, 15 Nov 2017 17:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

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

diff --git a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
index ed6a3b1..130719e 100644
--- a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
+++ b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
@@ -14,7 +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