feat: 冲突处理

src/components/MMCFlightControlCenter/components/hangar/components/list/components/item/index.vue

@@ -397,11 +397,6 @@ export default {
      * 接管无人机
      */
     async onTakeOver(hangar, departmentName) {
-<<<<<<< HEAD
-      // console.log('onTakeOver:',hangar);
-=======
-      console.log("onTakeOver:", hangar);
->>>>>>> 27917c45f08d5b25c7e99d25f541733177cce61c
       //upkeepStatus保养状态, upkeepErrorCode异常信息代码,upkeepTime保养时间
       const { upkeepStatus, upkeepErrorCode, upkeepTime, countdown } = hangar;