修复

src/views/Business/BusRouter.js

@@ -174,7 +174,6 @@ const BusRouter = [
   { path: 'cltdav', component: Cltdav, name: 'Cltdav', meta: { title: '打包托收开立' } },
   { path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } },
   { path: 'clttra', component: Clttra, name: 'Clttra', meta: { title: '打包托收催收' } },
-<<<<<<< Updated upstream
   { path: 'bdtcan', component: Bdtcan, name: 'Bdtcan', meta: { title: '买方信用证单据注销' } },
   { path: 'ditdla', component: Ditdla, name: 'Ditdla', meta: { title: '买方信用证减额接受' } },
 
@@ -184,10 +183,8 @@ const BusRouter = [
   { path: 'bttdck', component: Bttdck, name: 'Bttdck', meta: { title: '转让信用证单据第一受益人换单' } },
   { path: 'ccttra', component: Ccttra, name: 'Ccttra', meta: { title: '光票托收催收' } },
   { path: 'cctdcr', component: Cctdcr, name: 'Cctdcr', meta: { title: '光票托收退票' } },
-=======
   //{ path: 'cctdav', component: Cctdav, name: 'Cctdav', meta: { title: '光票托收开立' } },
   { path: 'cctset', component: Cctset, name: 'Cctset', meta: { title: '光票托收收汇' } },
->>>>>>> Stashed changes
 
 ]
 export default BusRouter
\ No newline at end of file

src/views/Layout/SideMenu.vue

@@ -105,13 +105,11 @@ export default {
         { inifrm: "lttopn", ininam: "转让证开立", pntmiu: "8" },
         { inifrm: "lttame", ininam: "转让证修改", pntmiu: "8" },
         { inifrm: "lttcan", ininam: "转让证注销", pntmiu: "8" },
-<<<<<<< Updated upstream
         { inifrm: "lttdav", ininam: "转让信用证单据第一受益人换单", pntmiu: "8" },
         { inifrm: "bttdck", ininam: "转让信用证通知到单", pntmiu: "8" },
         { inifrm: "9",ininam: "光票托收", pntmiu: "" },
         { inifrm: "ccttra", ininam: "光票托收催收", pntmiu: "9" },
         { inifrm: "cctdcr", ininam: "光票托收退票", pntmiu: "9" },
-=======
         { inifrm: "9", ininam: "打包托收", pntmiu: "" },
         { inifrm: "cltdav", ininam: "打包托收开立", pntmiu: "9" },
         { inifrm: "clttra", ininam: "打包托收催收", pntmiu: "9" },
@@ -120,7 +118,6 @@ export default {
         //{ inifrm: "cltdav", ininam: "光票托收开立", pntmiu: "10" },
         //{ inifrm: "clttra", ininam: "光票托收", pntmiu: "10" },
         { inifrm: "cctset", ininam: "光票托收收汇", pntmiu: "10" },
->>>>>>> Stashed changes
       ],
       menus: [],
     };