From f6d7a3f65aea500a275fa5f3f4325730bff16ade Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 九月 2023 09:35:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
index 1648d93..37b0ceb 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -70,6 +70,7 @@
             <if test="viewTime != null">view_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
             <if test="userId != null">user_id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="guideFlag != null">guide_flag,</if>
@@ -87,6 +88,7 @@
             <if test="viewTime != null">#{viewTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
             <if test="userId != null">#{userId},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="guideFlag != null">#{guideFlag},</if>
@@ -107,6 +109,7 @@
             <if test="viewTime != null">view_time = #{viewTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="guideFlag != null">guide_flag = #{guideFlag},</if>
@@ -161,4 +164,7 @@
           and alarm_time&lt;=#{alarmTime}
           and view_time is null
     </update>
+    <select id="selectArdAlarmRadarLastData" parameterType="String" resultMap="ArdAlarmRadarMoveResult">
+        select * from ard_alarm_radar_move where name=#{name} order by update_time desc LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3