快照路由更改

src/views/Review/ReviewRouter.js

@@ -90,14 +90,14 @@ import ReviewBetamc from "./Business/ReviewBetamc.vue";
 import ReviewCptcan from "./Business/ReviewCptcan.vue";
 import ReviewCptrep from "./Business/ReviewCptrep.vue";
 import ReviewCltdav from "./Business/ReviewCltdav.vue";
-<<<<<<< HEAD
+
 import ReviewTrtopn from "./Business/ReviewTrtopn.vue";
 import ReviewTrtame from "./Business/ReviewTrtame.vue";
 import ReviewTrtset from "./Business/ReviewTrtset.vue";
 import ReviewTrtrcl from "./Business/ReviewTrtrcl.vue";
 import ReviewTrtsel from "./Business/ReviewTrtsel.vue";
 import ReviewTrtcan from "./Business/ReviewTrtcan.vue";
-=======
+
 import ReviewLttdck from "./Business/ReviewLttdck.vue";
 
 import ReviewGetcrq from "./Business/ReviewGetcrq.vue";
@@ -107,7 +107,7 @@ import ReviewGitcan from "./Business/ReviewGitcan.vue";
 import ReviewGitcrj from "./Business/ReviewGitcrj.vue";
 import ReviewGitset from "./Business/ReviewGitset.vue";
 import ReviewGctcan from "./Business/ReviewGctcan.vue";
->>>>>>> 779482b90afbf8e154dfb3ff7760e0337f03902d
+
 
 
 
@@ -218,7 +218,6 @@ const ReviewRouter = [
     { path: "Cptcan", component: ReviewCptcan, name: "ReviewCptcan", meta: { title: "复核-Cptcan" } },
     { path: "Cptrep", component: ReviewCptrep, name: "ReviewCptrep", meta: { title: "复核-Cptrep" } },
 
-<<<<<<< HEAD
     { path: "Trtopn", component: ReviewTrtopn, name: "ReviewTrtopn", meta: { title: "复核-Trtopn" } },
     { path: "Trtame", component: ReviewTrtame, name: "ReviewTrtame", meta: { title: "复核-Trtame" } },
     { path: "Trtsel", component: ReviewTrtsel, name: "ReviewTrtsel", meta: { title: "复核-Trtsel" } },
@@ -226,7 +225,6 @@ const ReviewRouter = [
     { path: "Trtrcl", component: ReviewTrtrcl, name: "ReviewTrtrcl", meta: { title: "复核-Trtrcl" } },
     { path: "Trtcan", component: ReviewTrtcan, name: "ReviewTrtcan", meta: { title: "复核-Trtcan" } },
 
-=======
     { path: "getcrq", component: ReviewBctacc, name: "ReviewGetcrq", meta: { title: "复核-Getcrq" } },
     { path: "getcan", component: ReviewBctame, name: "ReviewGetcan", meta: { title: "复核-Getcan" } },
     { path: "gitcrq", component: ReviewBctcan, name: "ReviewGitcrq", meta: { title: "复核-Gitcrq" } },
@@ -235,7 +233,6 @@ const ReviewRouter = [
     { path: "gitcrj", component: ReviewBctrad, name: "ReviewGitcrj", meta: { title: "复核-Gitcrj" } },
     { path: "gctcan", component: ReviewBctsel, name: "ReviewGctcan", meta: { title: "复核-Gctcan" } },
     
->>>>>>> 779482b90afbf8e154dfb3ff7760e0337f03902d
 ];
 
 export default ReviewRouter;
\ No newline at end of file