Merge remote-tracking branch 'origin/master'

沈斌

2017-11-07 ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1

 src/main/resources/mapper/JobDao.xml

@@ -41,4 +41,12 @@
            </foreach>
    </insert>

    <select id="getAllEquipment" resultType="com.moral.monitor.entity.Equipment">
        select mac from equipment
    </select>

    <select id="getLoggerByMac" resultType="com.moral.monitor.entity.Logger">
        select time from history where mac=#{0} order by time DESC limit 1
    </select>

</mapper>