diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupVO.java index 05d5fe9..d78ef11 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupVO.java @@ -1,7 +1,6 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; import lombok.Data; import java.io.Serializable; @@ -27,6 +26,10 @@ public class GroupVO implements Serializable @Excel(name = "分组名称") private String groupName; + /** 无人机个数 */ + @Excel(name = "机场个数") + private Integer dockCount; + /** 机场列表 */ private List dockList; diff --git a/ruoyi-modules/tuoheng-device b/ruoyi-modules/tuoheng-device index 21702f0..3933ea2 160000 --- a/ruoyi-modules/tuoheng-device +++ b/ruoyi-modules/tuoheng-device @@ -1 +1 @@ -Subproject commit 21702f04d1344756cc45970fba4c8b046532a29d +Subproject commit 3933ea2ed3dab49fe6c976f80f4a43bacaf14282