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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

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

@@ -56,4 +56,14 @@
            (#{item.mac}, #{item.time}, #{item.value})
        </foreach>
    </insert>


    <insert id="insertHistoryHourlyAvg">
        INSERT INTO
        history_hourly_${timeUnits}
        VALUES
        <foreach collection="list" item="item" separator=",">
            (#{item.mac}, #{item.time}, #{item.value}, #{item.version})
        </foreach>
    </insert>
</mapper>