Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2024-04-01 fec3ada961082e800ce7b102146ed5d2e12e563c

 ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml

@@ -22,7 +22,7 @@
        <result column="created_at" property="createdAt" />
        <result column="update_at" property="updateAt" />
        <result column="total" property="total" />
        <result column="alarm_record_pics" property="alarmRecordPics" />
        <result column="alarm_record_pics" property="alarmRecordPicsString" />
    </resultMap>

    <!-- 通用查询结果列 -->