From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/service/IArdFlightTaskPartService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/service/IArdFlightTaskPartService.java b/ard-work/src/main/java/com/ard/work/service/IArdFlightTaskPartService.java
index 2dbf3c2..c906ed2 100644
--- a/ard-work/src/main/java/com/ard/work/service/IArdFlightTaskPartService.java
+++ b/ard-work/src/main/java/com/ard/work/service/IArdFlightTaskPartService.java
@@ -22,6 +22,6 @@
     /**
      * 获取完整轨迹(合并所有分片)
      */
-    List<TelemetryData> getCompleteFlightData(ArdFlightTaskPart ardFlightTaskPart);
+    List<UavFlightStateDTO> getCompleteFlightData(ArdFlightTaskPart ardFlightTaskPart);
 
 }

--
Gitblit v1.9.3