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

---
 src/main/resources/mapper/JobDao.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/JobDao.xml b/src/main/resources/mapper/JobDao.xml
index 0882bc9..d4baa19 100644
--- a/src/main/resources/mapper/JobDao.xml
+++ b/src/main/resources/mapper/JobDao.xml
@@ -46,7 +46,7 @@
     </select>
 
     <select id="getLoggerByMac" resultType="com.moral.monitor.entity.Logger">
-        select time from logger where mac=#{0} order by time DESC limit 1
+        select time from history where mac=#{0} order by time DESC limit 1
     </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0