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

cjl

2023-10-25 8af1bd5ed227ff568b3ac60f3594ae2a8dfd9dec

 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>