Commit 0beebc02 by liyixun

合并冲突

parent 24c2d259
...@@ -216,13 +216,9 @@ const ReviewRouter = [ ...@@ -216,13 +216,9 @@ const ReviewRouter = [
{ path: "ccttra", component: ReviewCcttra, name: "ReviewCcttra", meta: { title: "复核-Ccttra" } }, { path: "ccttra", component: ReviewCcttra, name: "ReviewCcttra", meta: { title: "复核-Ccttra" } },
{ path: "lttopn", component: ReviewLttopn, name: "ReviewLttopn", meta: { title: "复核-Lttopn" } }, { path: "lttopn", component: ReviewLttopn, name: "ReviewLttopn", meta: { title: "复核-Lttopn" } },
{ path: "cltdav", component: ReviewCltdav, name: "ReviewCltdav", meta: { title: "复核-Cltdav" } }, { path: "cltdav", component: ReviewCltdav, name: "ReviewCltdav", meta: { title: "复核-Cltdav" } },
<<<<<<< HEAD
{ path: "cltset", component: ReviewCltset, name: "ReviewCltset", meta: { title: "复核-Cltset" } }, { path: "cltset", component: ReviewCltset, name: "ReviewCltset", meta: { title: "复核-Cltset" } },
{ path: "clttra", component: ReviewClttra, name: "ReviewClttra", meta: { title: "复核-Clttra" } }, { path: "clttra", component: ReviewClttra, name: "ReviewClttra", meta: { title: "复核-Clttra" } },
=======
{ path: "lttdck", component: ReviewLttdck, name: "ReviewLttdck", meta: { title: "复核-Lttdck" } },
>>>>>>> 5ff75dabab23176ad31fe79802bc0bbfbb424721
{ path: "Cptati", component: ReviewCptati, name: "ReviewCptati", meta: { title: "复核-Cptati" } }, { path: "Cptati", component: ReviewCptati, name: "ReviewCptati", meta: { title: "复核-Cptati" } },
{ path: "Cptato", component: ReviewCptato, name: "ReviewCptato", meta: { title: "复核-Cptato" } }, { path: "Cptato", component: ReviewCptato, name: "ReviewCptato", meta: { title: "复核-Cptato" } },
{ path: "Cptcan", component: ReviewCptcan, name: "ReviewCptcan", meta: { title: "复核-Cptcan" } }, { path: "Cptcan", component: ReviewCptcan, name: "ReviewCptcan", meta: { title: "复核-Cptcan" } },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment