Merge remote-tracking branch 'origin/master'

沈斌

2017-10-30 faec027b63bb19d061098724754895ae801ad493

 src/main/resources/mapper/HistoryEntityMapper.xml

@@ -306,4 +306,7 @@
         state

   </select>



   <select id="getMacLogByLast" resultType="string">

      SELECT mac_log FROM logger ORDER BY time DESC LIMIT 1

   </select>

</mapper>