From 62f930cee9ef7031421890cd2c9b636f10ef727a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 20 Nov 2025 10:13:59 +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 3f6c0ae..dae11c0 100644
--- a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
@@ -114,7 +114,7 @@
     </update>
 
     <!-- 根据任务ID获取飞行任务 -->
-    <select id="getArdFlightTaskById" resultType="ArdFlightTask">
+    <select id="getArdFlightTaskById" resultMap="ArdFlightTaskResult">
         SELECT *
         FROM ard_flight_task
         WHERE task_id = #{taskId}

--
Gitblit v1.9.3