Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-20 a9cc2343ceaad3e99dc25eb036dc99aeded279a6

 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>