From 63c368aae958cb80ab02546ef2022b771411710e Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 10 Mar 2026 14:32:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-inspection/src/main/java/com/ard/inspection/domain/ArdPointCloud.java  |    6 +++++-
 ard-route/src/main/java/com/ard/route/domain/djuav/TargetPosObj.java       |    2 ++
 ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java |    2 ++
 ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java    |    2 ++
 ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java     |    2 ++
 ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java        |    7 ++++---
 ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java |    2 ++
 ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java     |    2 ++
 ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java    |    2 +-
 ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java      |    2 ++
 ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java     |    2 ++
 11 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/ard-inspection/src/main/java/com/ard/inspection/domain/ArdPointCloud.java b/ard-inspection/src/main/java/com/ard/inspection/domain/ArdPointCloud.java
index 42c8518..c6e4297 100644
--- a/ard-inspection/src/main/java/com/ard/inspection/domain/ArdPointCloud.java
+++ b/ard-inspection/src/main/java/com/ard/inspection/domain/ArdPointCloud.java
@@ -4,13 +4,17 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * 点云文件
  * @author xia
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class ArdPointCloud extends BaseEntity {
+public class ArdPointCloud extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * ID
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java
index 94e48d7..9c1d43a 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java
@@ -12,6 +12,8 @@
 @Data
 public class ActionGroupReq implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 动作组编号
      */
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java
index 800247a..bf62e52 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java
@@ -11,6 +11,8 @@
 @Data
 public class CoordinatePointReq implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 经度
      */
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java
index 0642603..898edd1 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java
@@ -12,6 +12,8 @@
 @Data
 public class MappingTypeReq implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 采集方式
      */
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
index d46226f..aa600e4 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
@@ -7,6 +7,8 @@
 @Data
 public class PointActionReq implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 动作编号
      */
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java
index 03fbdcf..488e05b 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java
@@ -12,6 +12,8 @@
 @Data
 public class RoutePointReq implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 航点编号
      */
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/TargetPosObj.java b/ard-route/src/main/java/com/ard/route/domain/djuav/TargetPosObj.java
index dcb2596..83f83de 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/TargetPosObj.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/TargetPosObj.java
@@ -11,6 +11,8 @@
 @Data
 public class TargetPosObj implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 经度
      */
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java
index 5ce5286..696f3fa 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java
@@ -6,12 +6,13 @@
 import java.util.List;
 
 /**
- * Author:xia
- * Date: 2024/12/22 10:46
- **/
+ * @author xia
+ */
 @Data
 public class UavRouteReq implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 航线类型
      * waypoint：航点飞行
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java
index 0b2ea18..477250f 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java
@@ -11,6 +11,8 @@
 @Data
 public class WaypointHeadingReq implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 偏航角模式
      */
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java
index 306bf98..134c921 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java
@@ -11,6 +11,8 @@
 @Data
 public class WaypointTurnReq implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 航点转弯模式
      */
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
index 103ac9b..0075db0 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
@@ -40,7 +40,7 @@
      * @param ardRouteInfo 航线(kmz)
      * @return 结果
      */
-    public String insertArdRouteInfo(ArdRouteInfo ardRouteInfo);
+    public String  insertArdRouteInfo(ArdRouteInfo ardRouteInfo);
 
     /**
      * 修改航线(kmz)

--
Gitblit v1.9.3