1 changed files with 3 additions and 5 deletions
+ 3
- 5
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/IInspectionService.java
View File
| JsonResult resubmit(EditInspectionRequest editInspectionRequest); | JsonResult resubmit(EditInspectionRequest editInspectionRequest); | ||||
| /** | /** | ||||
| <<<<<<< HEAD | |||||
| * 获取飞行轨迹 | * 获取飞行轨迹 | ||||
| * @param id | * @param id | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| JsonResult findFlightData(String id); | JsonResult findFlightData(String id); | ||||
| ======= | |||||
| * 立即执行 | |||||
| * | |||||
| /** | |||||
| * 立即执行 | |||||
| * @param id 任务id | * @param id 任务id | ||||
| * @return 结果 | * @return 结果 | ||||
| */ | */ | ||||
| JsonResult execute(String id); | JsonResult execute(String id); | ||||
| >>>>>>> 187812e997321373e2dee541777d3ca3493967dd | |||||
| } | } |
Loading…