screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -39,8 +39,8 @@ <foreach collection="macs" item="mac" index="index" open="(" close=")" separator=","> #{mac} </foreach> AND `time` <![CDATA[>=]]> #{start} AND `time` <![CDATA[<]]> #{end} AND DATE_FORMAT(`time`,'%Y-%m-%d %H') <![CDATA[>=]]> #{start} AND DATE_FORMAT(`time`,'%Y-%m-%d %H') <![CDATA[<]]> #{end} ORDER BY `time` </select> <select id="deviceList" resultType="java.util.Map">