From 43d81456014338d53aefc3ec81a9eafa38bf8a3f Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 02 Nov 2017 05:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

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

--
Gitblit v1.8.0