Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Business/BusRouter.js

@@ -103,17 +103,14 @@ import TrnfndsDetail from "./Trnrel/Trnfnd/TrnfndsDetail"
 import Sptpopup from "./Sptsel/Sptpopup"
 import Infdet from "./Infdet"
 import Infbfd from "./Infbfd"
-<<<<<<< HEAD
 import Detopn  from "./Detopn"
 import Detame  from "./Detame"
 import Detsel  from "./Detsel"
-=======
 import Bftsnd from "./Bftsnd"
 import Bftset from "./Bftset"
 import Detdrv from "./Detdrv"
 import Bftacc from "./Bftacc"
 import Bftdcr from "./Bftdcr"
->>>>>>> 1ca258d28cb1889f4bc1c74889d87dc32ec3f9eb
 /**
  * 带有name的才会被添加进顶部的标签页里
  */
@@ -226,17 +223,15 @@ const BusRouter = [
   { path: 'bdtset', component: Bdtset, name: 'Bdtset', meta: { title: '信用证付款' } },
   { path: 'infdet', component: Infdet, name: 'Infdet', meta: { title: '卖方信用证查询' } },
   { path: 'infbfd', component: Infbfd, name: 'Infbfd', meta: { title: '卖方信用证单据查询' } },
-<<<<<<< HEAD
   { path: 'detopn', component: Detopn, name: 'Detopn', meta: { title: '信用证开立' } },
   { path: 'detame', component: Detame, name: 'Detame', meta: { title: '信用证修改' } },
   { path: 'detsel', component: Detsel, name: 'Detsel', meta: { title: '信用证查询' } },
 
-=======
+
   { path: 'bftsnd', component: Bftsnd, name: 'Bftsnd', meta: { title: '卖方信用证寄单' } },
   { path: 'bftset', component: Bftset, name: 'Bftset', meta: { title: '卖方信用证收款' } },
   { path: 'detdrv', component: Detdrv, name: 'Detdrv', meta: { title: '卖方信用证收单' } },
   { path: 'bftacc', component: Bftacc, name: 'Bftacc', meta: { title: '卖方信用证单据承兑' } },
   { path: 'bftdcr', component: Bftdcr, name: 'Bftdcr', meta: { title: '卖方信用证单据电提不符点/开证行拒付' } },
->>>>>>> 1ca258d28cb1889f4bc1c74889d87dc32ec3f9eb
 ]
 export default BusRouter