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

cjl

2023-07-19 43c631ad573535f4434caf19423824d4bd3f8ca7

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

@@ -7,4 +7,12 @@
        VALUES (#{mac}, #{time}, #{value}, #{version})
    </insert>


    <select id="selectHistoryHourly" resultType="java.util.Map">
        SELECT `value`
        FROM history_hourly_${timeUnits}
        WHERE `time` = #{time}
          and mac = #{mac}
    </select>

</mapper>