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

cjl

2023-08-18 acb0dc47e516cf6942ebe268d9a3fce7944963b9

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

@@ -75,4 +75,9 @@
        where mac = #{mac}
          and time =#{time}
    </select>

    <insert id="insertHistoryHourly">
        INSERT INTO history_hourly_${timeUnits}
        VALUES (#{mac}, #{time}, #{value}, #{version})
    </insert>
</mapper>