合并冲突处理

src/views/Business/Inftrd/Infsea.vue

@@ -521,7 +521,6 @@ export default {
       initdialog: false,
       stmData: {
         columns: [
-<<<<<<< HEAD
           '1 1 "进口融资编号" 200',
           '2 2 "客户经理" 110',
           // '13 3 "Finance Type" 130 1 0 1 TRD:FINTYP',
@@ -588,34 +587,6 @@ export default {
           '10 24 "融资天数" 100 2',
           '11 25 "海外代付天数" 205 0',
           '12 26 "支行名称" 205',
-=======
-        '1 1 \"Reference\" 200',
-        '2 2 \"Resp. User\" 110',
-        "13 3 \"Finance Type\" 130 1 0 1 TRD:FINTYP",
-        "14 4 \"货物类型\" 120 1 0 1 GODCOD",
-        "3 5 \"Parent Contract\" 150",
-        "4 6 \"执行利率\" 110 2",
-        "15 7 \"Pta .No\" 110",
-        "16 8 \"Party Number\" 205",
-        "17 9 \"Financed party\" 300",
-        "18 10 \"Financed CN\" 205",
-        "5 11 \"融资状态\" 100 1 0 1 TRD:OVDFLG",
-        "6 12 \"融资账号\" 100",
-        "24 13 \"组织机构代码\" 130",
-        "7 14 \"Opened\" 200 4 7",
-        "8 15 \"Expired\" 200 4 7",
-        "19 16 \"Pty .No\" 110",
-        "9 17 \"Closed\" 100 4 7",
-        "20 18 \"Cur\" 100",
-        "22 19 \"Cur\" 100",
-        "21 20 \"Amount\" 110 2 8 1 20",
-        "23 21 \"Open Amount\" 200 2 8 1 22",
-        "25 22 \"海外代付行\" 150",
-        "26 23 \"海外代付行\" 150",
-        "10 24 \"融资天数\" 100 2",
-        "11 25 \"海外代付天数\" 205 0",
-        "12 26 \"支行名称\" 205",
->>>>>>> 64c51cebbed0db16860d220f23e8c5652ae00aba
         ],
         data: [],
       },