From 750bcef194d5e114d684e204b75b4581bb94183a Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期一, 29 一月 2024 12:59:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml
index 3eca8e2..d3d2ff2 100644
--- a/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml
@@ -45,7 +45,7 @@
             <if test="outboundTime != null "> and outbound_time = #{outboundTime}</if>
             <if test="outRsSign != null "> and out_rs_sign = #{outRsSign}</if>
             <if test="outRsSign != null "> and out_rs_sign = #{outRsSign}</if>
-
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and outbound_time between #{startTime} and #{endTime}</if>
         </where>
     </select>
     

--
Gitblit v1.9.3