From f3a075ec4e1f04a1b3aefffb749543bba0bd1f8c 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:55:54 +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

---
 .../device/api/domain/AircraftDetailVO.java   | 33 +----------------
 .../ruoyi/device/api/domain/DockDetailVO.java | 37 +------------------
 ruoyi-modules/tuoheng-device                  |  2 +-
 3 files changed, 3 insertions(+), 69 deletions(-)

diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java
index 5cda89d..1931737 100644
--- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java
+++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java
@@ -14,27 +14,11 @@ import java.util.List;
  * @date 2026-01-20
  */
 @Data
-public class AircraftDetailVO implements Serializable {
+public class AircraftDetailVO extends AircraftVO {
     private static final long serialVersionUID = 1L;
 
     // ========== 基本信息区域 ==========
 
-    /** 无人机ID */
-    @Excel(name = "无人机ID")
-    private Long aircraftId;
-
-    /** 无人机IOT ID */
-    @Excel(name = "无人机IOT ID")
-    private String aircraftIotId;
-
-    /** 厂商名称 */
-    @Excel(name = "厂商名称")
-    private String manufacturerName;
-
-    /** 无人机型号 */
-    @Excel(name = "无人机型号")
-    private String aircraftModel;
-
     /** 无人机版本 */
     @Excel(name = "无人机版本")
     private String aircraftVersion;
@@ -55,16 +39,6 @@ public class AircraftDetailVO implements Serializable {
     @Excel(name = "运维剩余天数")
     private Integer maintenanceDays;
 
-    // ========== 运行信息区域 ==========
-
-    /** 无人机名称 */
-    @Excel(name = "无人机名称")
-    private String aircraftName;
-
-    /** 无人机状态 */
-    @Excel(name = "无人机状态")
-    private String aircraftStatus;
-
     // ========== 统计信息区域 ==========
 
     /** 飞行时长 */
@@ -75,11 +49,6 @@ public class AircraftDetailVO implements Serializable {
     @Excel(name = "作业架次")
     private Integer missionCount;
 
-    // ========== 挂载列表 ==========
-
-    /** 挂载列表 */
-    private List<PayloadDetailVO> payloadList;
-
     // ========== 网络列表 ==========
 
     /** 网络列表 */
diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java
index 0ab809c..38f3f92 100644
--- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java
+++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java
@@ -13,34 +13,11 @@ import java.io.Serializable;
  * @date 2026-01-20
  */
 @Data
-public class DockDetailVO implements Serializable {
+public class DockDetailVO extends DockVO {
     private static final long serialVersionUID = 1L;
 
     // ========== 基本信息区域 ==========
 
-    /**
-     * 机场ID
-     */
-    @Excel(name = "机场ID")
-    private Long dockId;
-
-    /**
-     * 机场IOT ID
-     */
-    @Excel(name = "机场IOT ID")
-    private String dockIotId;
-
-    /**
-     * 厂商名称
-     */
-    @Excel(name = "厂商名称")
-    private String manufacturerName;
-
-    /**
-     * 机场型号
-     */
-    @Excel(name = "机场型号")
-    private String dockModel;
 
     /**
      * 固件版本
@@ -68,18 +45,6 @@ public class DockDetailVO implements Serializable {
 
     // ========== 运行信息区域 ==========
 
-    /**
-     * 机场名称
-     */
-    @Excel(name = "机场名称")
-    private String dockName;
-
-    /**
-     * 机场状态
-     */
-    @Excel(name = "机场状态")
-    private String dockStatus;
-
     /**
      * 备降点坐标（经度）
      */
diff --git a/ruoyi-modules/tuoheng-device b/ruoyi-modules/tuoheng-device
index 1ea9422..35c0cf0 160000
--- a/ruoyi-modules/tuoheng-device
+++ b/ruoyi-modules/tuoheng-device
@@ -1 +1 @@
-Subproject commit 1ea9422f407bb13dc25a1ab3bc71008b79343475
+Subproject commit 35c0cf0c63062473179a4c76d0cb4158adb60d4f