From b20738c3993b7b8f80c2dee6edf1b4faf7dbecb0 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 15 Oct 2025 17:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java | 9 ++++++---
1 files changed, 6 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..e46879f 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
@@ -26,10 +26,10 @@
private String host;
/** tcp端口 */
- private String tcpPort;
+ private Integer tcpPort;
- /** 环境地址端口 */
- private String httpPort;
+ /** http端口 */
+ private Integer httpPort;
/** 访问密钥ID */
private String accessKeyId;
@@ -52,6 +52,9 @@
/** 部门ID */
private Long deptId;
+ /** 服务器状态 */
+ private Long serverStatus;
+
private List<ArdDroneInfo> ardDroneInfoList;
}
--
Gitblit v1.9.3