From a9780c49f8cf587af26cc83d439320ad02b8668f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 15 Oct 2025 09:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 9200465..8efdfde 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
@@ -10,12 +10,11 @@
import java.util.Objects;
/**
- * 无人机盒子对象 uav_box
+ * 无人机盒子对象 ard_drone_info
*
* @author ruoyi
* @date 2025-03-04
*/
-
@Data
@Builder
@AllArgsConstructor
@@ -25,7 +24,7 @@
private static final long serialVersionUID = 1L;
/** 主键 */
- private Long id;
+ private String id;
/** 盒子编码 */
@Excel(name = "盒子编码")
--
Gitblit v1.9.3