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

zhaowenyu

2025-10-17 1ab85e9fd1b392d36c6f2b08754249e4574ea4e8

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

@@ -52,8 +52,12 @@
    /** 部门ID */
    private Long deptId;

    /** 服务器状态 */
    private Long serverStatus;
    /**
     * 服务器状态
     * 0：离线
     * 1：在线
     */
    private String serverStatus;

    private List<ArdDroneInfo> ardDroneInfoList;