ct

xichongSys/src/router/index.js

@@ -25,15 +25,7 @@ import receivePersonnel from "@/views/Myvue/receivePersonnel";
 import AllbaseInfo from "@/views/Myvue/allbaseInfo"
 import PayInfo from "@/views/Myvue/payInfo"
 import application from "@/views/Myvue/application"
-<<<<<<< HEAD
-import importByExcel from "@/views/Myvue/importByExcel"
-import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit"
-import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit"
-import supPaymentAudit from "@/views/Myvue/supPaymentAudit"
-import traRelationsAudit from "@/views/Myvue/traRelationsAudit"
-import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit"
 import authRecordphone from "@/views/Myvue/authRecordphone"
-=======
 import importByExcel from "@/views/Myvue/importByExcel";
 import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit";
 import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit";
@@ -44,8 +36,6 @@ import drcbzx from "@/views/Myvue/drcbzx";
 import drbjbf from "@/views/Myvue/drbjbf";
 import drtsyw from "@/views/Myvue/drtsyw";
 
-
->>>>>>> 4e201c5fbe015e3f7e92292d7a21d0239a5d74d1
 Vue.use(Router)
 
 const router = new Router({