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

zhaowenyu

2026-03-11 2acf49278129e5870d8b775519a2bc1461294fb8

 ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java

@@ -37,7 +37,6 @@

import static com.ard.route.util.RouteFileUtils.*;
import static com.ard.route.util.ToolUtils.*;
import static com.ard.route.util.UavRouteReqUtils.kmzInfoVOToUavRouteReq;

/**
 * Author:xia
@@ -199,6 +198,7 @@
                    "application/vnd.google-earth.kmz",
                    new ByteArrayInputStream(baos.toByteArray())
            );
            // 上传文件
            String kmzFilePath = ossService.upload(kmzPath,multipartFile);
            result.setPath(kmzFilePath);
            return result;
@@ -236,7 +236,7 @@
     */
    @Override
    public UavRouteReq kmzInfoVoToUavRouteReq(KmzInfoVo kmzInfoVo) {
        return kmzInfoVOToUavRouteReq(kmzInfoVo);
        return kmzInfoVoToUavRouteReq(kmzInfoVo);
    }

}