~chenjialiang/moral.git

			@@ -14,13 +14,12 @@
			`device` AS d
			WHERE d.mac = h.mac
			AND d.mac IN
			(SELECT mac FROM device WHERE monitor_point_id IN
			(SELECT mac FROM device WHERE is_delete = '0' and monitor_point_id IN
			<foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
			#{monitorPointId}
			</foreach>
			)
			AND h.time = (SELECT max(time) FROM history_five_minutely_${timeUnits})
			AND d.is_delete = '0'
			</select>

			</mapper>

			@@ -32,7 +32,7 @@
			`device` AS d
			WHERE d.mac = h.mac
			AND d.mac IN
			(SELECT mac FROM device WHERE monitor_point_id IN
			(SELECT mac FROM device WHERE is_delete = '0' and monitor_point_id IN
			<foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
			#{monitorPointId}
			</foreach>

	screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml	3 ●●●●● patch \| view \| raw \| blame \| history
	screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history