Merge branch 'cjl' into dev

cjl

2023-08-26 6d4ee331b8fa5fc65a7a875a54b32118e9cd903f

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

@@ -26,4 +26,10 @@
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT '报警信息小时表';
    </update>

    <insert id="insertAlarmInfo">
        insert into alarm_info_${timeUnits}
        (alarm_time,`index`,device_id,alarm_type,alarm_information)
        values (#{map.alarmTime},#{map.index},#{map.deviceId},#{map.alarmType},#{map.alarmInformation})
    </insert>

</mapper>