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

zhaowenyu

2025-10-13 765fee4deb1eaf56e504748301ec89d46c19a2d7

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