Merge remote-tracking branch 'origin/master'

沈斌

2017-10-27 a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424

 src/main/resources/mapper/JobDao.xml

@@ -19,4 +19,8 @@
        where a.mac = #{0}
    </select>

    <update id="updateStateByMac">
        UPDATE equipment SET state=#{1} WHERE mac=#{0}
    </update>

</mapper>