From 0f5b969ddd52ca43ef003867b5a6749d74b7d71d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 12 Nov 2025 17:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..b96ad89 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
@@ -3,19 +3,18 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import com.ard.work.domain.receiver.BoxInfoReceiver;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.*;
import java.util.Date;
import java.util.Objects;
/**
- * 无人机盒子对象 ard_drone_info
+ * 无人机盒子对象 ard_drone
*
- * @author ruoyi
+ * @author ard
* @date 2025-03-04
*/
-
@Data
@Builder
@AllArgsConstructor
@@ -40,6 +39,7 @@
private String boxVersion;
/** 启动时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "启动时间")
private Date startTime;
@@ -69,7 +69,11 @@
/** 服务器管理ID */
@Excel(name = "服务器管理ID")
- private String serverInfoId;
+ private String serverId;
+
+ /** 盒子别名 */
+ @Excel(name = "盒子别名")
+ private String boxAliasName;
/**
* 服务器实体对象
--
Gitblit v1.9.3