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/ArdDroneInfo.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
index 999ab85..1d74cb6 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
@@ -15,7 +15,6 @@
* @author ruoyi
* @date 2025-03-04
*/
-
@Data
@Builder
@AllArgsConstructor
@@ -69,7 +68,7 @@
/** 服务器管理ID */
@Excel(name = "服务器管理ID")
- private String serverInfoId;
+ private String serverId;
/**
* 服务器实体对象
--
Gitblit v1.9.3