From 19763ebd20ad16435f3c1ccfdc8abd1518712cc1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 24 Dec 2025 15:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
index 5f7bd31..a231ccf 100644
--- a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
@@ -61,7 +61,7 @@
                     AND aft.create_time &gt;= #{params.beginTime}
                 </if>
                 <if test="params.endTime != null"><!-- 结束时间检索 -->
-                    ANDaft.create_time &lt;= #{params.endTime}
+                    AND aft.create_time &lt;= #{params.endTime}
                 </if>
             </trim>
         </where>

--
Gitblit v1.9.3