Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-15 a9780c49f8cf587af26cc83d439320ad02b8668f

 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 = "盒子编码")