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

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

 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>