From 765fee4deb1eaf56e504748301ec89d46c19a2d7 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 13 Oct 2025 09:11:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java | 2 +-
1 files changed, 1 insertions(+), 1 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..9aa97bf 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
@@ -25,7 +25,7 @@
private static final long serialVersionUID = 1L;
/** 主键 */
- private Long id;
+ private String id;
/** 盒子编码 */
@Excel(name = "盒子编码")
--
Gitblit v1.9.3