From 1ab85e9fd1b392d36c6f2b08754249e4574ea4e8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 17 Oct 2025 16:22:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 e46879f..ce3d01d 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
@@ -52,8 +52,12 @@
/** 部门ID */
private Long deptId;
- /** 服务器状态 */
- private Long serverStatus;
+ /**
+ * 服务器状态
+ * 0：离线
+ * 1：在线
+ */
+ private String serverStatus;
private List<ArdDroneInfo> ardDroneInfoList;
--
Gitblit v1.9.3