From 638408723ebbf884f59ecaafcaab1c29f69bc689 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 15 Jul 2024 16:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev

---
 src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java b/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
index 109a707..c95ed95 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
@@ -83,7 +83,7 @@
      * @param creator
      * @return
      */
-    void importKmzFile(MultipartFile file, String workspaceId, String creator,String patchesId,String spotInFreckle);
+    String importKmzFile(MultipartFile file, String workspaceId, String creator,String patchesId,String spotInFreckle);
 
     /**
      * 创建航线,返回航线对象

--
Gitblit v1.9.3