修改无人机状态

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;
 
-    /** 无人机信息 */
+    /** 无人机ID */
-    private AircraftVO aircraft;
+    @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;
 
 }

ruoyi-modules/tuoheng-device

@@ -1 +1 @@
-Subproject commit 7d51087047298ca29afe98b58b923bca14193163
+Subproject commit 680cdc2cb0a982fd05aa251b7b52096f89ea1a2d