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

Xiajijian

2025-10-15 b20738c3993b7b8f80c2dee6edf1b4faf7dbecb0

 ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java

@@ -15,7 +15,6 @@
 * @author ruoyi
 * @date 2025-03-04
 */

@Data
@Builder
@AllArgsConstructor
@@ -69,7 +68,7 @@

    /** 服务器管理ID */
    @Excel(name = "服务器管理ID")
    private String serverInfoId;
    private String serverId;

    /**
     * 服务器实体对象