From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
index 10c5e89..4390856 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.alarm.radar.mapper.ArdAlarmRadarPumpMapper">
-    
+
     <resultMap type="ArdAlarmRadarPump" id="ArdAlarmRadarPumpResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
@@ -22,12 +22,12 @@
     </resultMap>
 
     <sql id="selectArdAlarmRadarPumpVo">
-        select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url1, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_pump
+        select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_pump
     </sql>
 
     <select id="selectArdAlarmRadarPumpList" parameterType="ArdAlarmRadarPump" resultMap="ArdAlarmRadarPumpResult">
         <include refid="selectArdAlarmRadarPumpVo"/>
-        <where>  
+        <where>
             <if test="name != null  and name != ''"> and name like '%'||#{name}||'%'</if>
             <if test="targetId != null  and targetId != ''"> and target_id = #{targetId}</if>
             <if test="alarmType != null  and alarmType != ''"> and alarm_type = #{alarmType}</if>
@@ -48,12 +48,12 @@
         </where>
         order by alarm_time desc
     </select>
-    
+
     <select id="selectArdAlarmRadarPumpById" parameterType="String" resultMap="ArdAlarmRadarPumpResult">
         <include refid="selectArdAlarmRadarPumpVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertArdAlarmRadarPump" parameterType="ArdAlarmRadarPump">
         insert into ard_alarm_radar_pump
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -118,7 +118,7 @@
     </delete>
 
     <delete id="deleteArdAlarmRadarPumpByIds" parameterType="String">
-        delete from ard_alarm_radar_pump where id in 
+        delete from ard_alarm_radar_pump where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -172,4 +172,4 @@
         from ard_alarm_radar_pump
         where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3