From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml b/ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml
index 07b650e..fd920a0 100644
--- a/ycl-smoke/src/main/resources/mapper/smoke/OdsAlarmRecordMapper.xml
+++ b/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>
 
     <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->

--
Gitblit v1.8.0