From 1616262d6d534d2c31ab3aea9496420bf5ce5853 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 06 Nov 2025 14:09:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
index 4e7afcd..b388502 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.ard.common.core.domain.BaseEntity;
+import lombok.Builder;
 import lombok.Data;
 
 /**
@@ -26,10 +27,10 @@
     private String host;
 
     /** tcp端口 */
-    private String tcpPort;
+    private Integer tcpPort;
 
-    /** 环境地址端口 */
-    private String httpPort;
+    /** http端口 */
+    private Integer httpPort;
 
     /** 访问密钥ID */
     private String accessKeyId;
@@ -52,6 +53,13 @@
     /** 部门ID */
     private Long deptId;
 
+    /**
+     * 服务器状态
+     * 0:离线
+     * 1:在线
+     */
+    private String serverStatus;
+
     private List<ArdDroneInfo> ardDroneInfoList;
 
 }

--
Gitblit v1.9.3