Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-30 2e0bf4423c235802791012e1fb0817d2c9156b2a

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

@@ -80,4 +80,10 @@
        INSERT INTO history_hourly_${timeUnits}
        VALUES (#{mac}, #{time}, #{value}, #{version})
    </insert>


    <insert id="updateHistoryHourly">
        UPDATE history_hourly_${timeUnits} SET `value` = #{value}
        where mac =  #{mac} and time = #{time} and version = #{version}
    </insert>
</mapper>