Merge remote-tracking branch 'origin/master'

Administrator

2023-07-28 c45ce58884c59ddf8a6051ba370215e6f62adeb8

 ard-work/src/main/resources/mapper/alarm/ArdAlarmExternalMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.alarm.externalAlarm.mapper.ArdAlarmExternalMapper">
<mapper namespace="com.ruoyi.alarm.external.mapper.ArdAlarmExternalMapper">

    <resultMap type="ArdAlarmExternal" id="ArdAlarmExternalResult">
        <result property="id"    column="id"    />