From 423a50bb662de75d075e5f07a6ec565591fac701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Wed, 21 Jan 2026 16:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E4=BA=BA=E6=9C=BA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/device/api/domain/DockVO.java   | 28 +++++++++++++++++--
 ruoyi-modules/tuoheng-device                  |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java
index 8088c27..d41a01f 100644
--- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java
+++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java
@@ -46,7 +46,31 @@ public class DockVO implements Serializable {
     @Excel(name = "机场状态")
     private String dockStatus;
 
-    /** 无人机信息 */
-    private AircraftVO aircraft;
+    /** 无人机ID */
+    @Excel(name = "无人机ID")
+    private Long aircraftId;
+
+    /** 无人机IOT ID */
+    @Excel(name = "无人机IOT ID")
+    private String aircraftIotId;
+
+    /** 无人机名称 */
+    @Excel(name = "无人机名称")
+    private String aircraftName;
+
+    /** 无人机厂商 */
+    @Excel(name = "无人机厂商")
+    private String aircraftManufacturer;
+
+    /** 无人机型号 */
+    @Excel(name = "无人机型号")
+    private String aircraftModel;
+
+    /** 无人机状态 */
+    @Excel(name = "无人机状态")
+    private String aircraftStatus;
+
+    /** 挂载列表 */
+    private List<PayloadVO> payloadList;
 
 }
diff --git a/ruoyi-modules/tuoheng-device b/ruoyi-modules/tuoheng-device
index 7d51087..680cdc2 160000
--- a/ruoyi-modules/tuoheng-device
+++ b/ruoyi-modules/tuoheng-device
@@ -1 +1 @@
-Subproject commit 7d51087047298ca29afe98b58b923bca14193163
+Subproject commit 680cdc2cb0a982fd05aa251b7b52096f89ea1a2d