Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

 screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml

@@ -21,4 +21,15 @@
        AND h.time = (SELECT max(time) FROM history_five_minutely_${timeUnits})
    </select>

    <select id="listResult" resultType="com.moral.api.entity.HistoryFiveMinutely">
        SELECT mac,time,value FROM history_five_minutely${table}
        WHERE (mac = #{mac} AND time BETWEEN #{startDate} AND #{endDate})
        order by time desc
    </select>
    <select id="listResultOne" resultType="com.moral.api.entity.HistoryFiveMinutely">
        SELECT mac,time,value FROM history_five_minutely${table}
        WHERE (mac = #{mac})
        order by time desc
        limit 1
    </select>
</mapper>