根据任务id获取巡检轨迹

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/IInspectionService.java

@@ -85,19 +85,17 @@ public interface IInspectionService {
     JsonResult resubmit(EditInspectionRequest editInspectionRequest);
 
     /**
-<<<<<<< HEAD
      * 获取飞行轨迹
      * @param id
      * @return
      */
     JsonResult findFlightData(String id);
-=======
-     * 立即执行
-     *
+
+     /**
+      * 立即执行
      * @param id 任务id
      * @return 结果
      */
     JsonResult execute(String id);
 
->>>>>>> 187812e997321373e2dee541777d3ca3493967dd
 }