From 435f6e023163ccee35dda99e9c07c187c8f0b9c6 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 08 五月 2025 18:20:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
index e4c2477..a1c00c3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
@@ -37,7 +37,8 @@
             <if test="altitude != null "> and g.altitude = #{altitude}</if>
             <if test="speed != null "> and g.speed = #{speed}</if>
             <if test="direction != null "> and g.direction = #{direction}</if>
-            <if test="collectTime != null  and collectTime != ''"> and g.collect_time = #{collectTime}</if>
+            <if test="beginTime != null and beginTime != ''"> and g.collect_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and g.collect_time &lt;= #{endTime}</if>
         </where>
     </select>
     

--
Gitblit v1.9.1