diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index fe6825d3..3811ac82 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -814,18 +814,12 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
         immediate: false,
         onChange: (e, obj) => {
           if (e && obj) {
-<<<<<<< HEAD
-=======
             formActionType ? formActionType.linkageForm({ key: 'dischargePortCode', value: obj }) : null
->>>>>>> e9316a4348efafd41d299d3b56e1bb06449abd4d
             formModel.dischargePortId = obj.id
             formModel.dischargePort = obj.portName
           }
           if (!e && !obj) {
-<<<<<<< HEAD
-=======
             formActionType ? formActionType.linkageForm({ key: 'dischargePortCode', value: null }) : null
->>>>>>> e9316a4348efafd41d299d3b56e1bb06449abd4d
             formModel.dischargePortId = null
             formModel.dischargePort = null
           }
@@ -1042,8 +1036,6 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
   // },
 ]
 
-<<<<<<< HEAD
-=======
 // 备注信息表单
 export const noteFormSchema: FormSchema[] = [
   {
@@ -1335,7 +1327,6 @@ export const noteFormSchema: FormSchema[] = [
   }
 ]
 
->>>>>>> e9316a4348efafd41d299d3b56e1bb06449abd4d
 // ediMore表单
 export const ediMoreFormSchema: FormSchema[] = [
   {
@@ -2163,11 +2154,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     show: false
   },
   {
-<<<<<<< HEAD
-    label: '船司航线',
-=======
     label: '',
->>>>>>> e9316a4348efafd41d299d3b56e1bb06449abd4d
     field: 'lane',
     component: 'Input',
     show: false,
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index 3edd4b79..30b675cf 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -169,8 +169,6 @@
   const editCustomerNo = () => {
     customerNoRef.value.focus()
   }
-<<<<<<< HEAD
-=======
   // 1.根据账期设置自动带出结算日期。
   // 2.自动带出市场来源及来源明细。
   // 3.自动带出揽货人、操作、单证
@@ -183,7 +181,6 @@
       emitter.emit('seaAddNotes', item.value)
     }
   }
->>>>>>> e9316a4348efafd41d299d3b56e1bb06449abd4d
   watch(
     () => props.details,
     (v) => {