From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java b/ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java
index 3a13661..36bdc5c 100644
--- a/ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java
@@ -1,6 +1,5 @@
 package com.ard.route.util;
 
-import com.ard.oss.service.impl.OssServiceContext;
 import com.ard.route.domain.djuav.ActionGroupReq;
 import com.ard.route.domain.djuav.PointActionReq;
 import com.ard.route.domain.djuav.RoutePointReq;
@@ -12,7 +11,6 @@
 import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;

--
Gitblit v1.9.3