code merge

modules/reports/routes/report_router.js

@@ -4,20 +4,14 @@
 
 let express = require('express');
 
-<<<<<<< HEAD
-rptRouter.post('/getReport', reportController.getReportAllPages);
-rptRouter.get('/getExcel/:id/:size/:rptName/:isOneSheet', reportController.getExcel);
-=======
 module.exports = function (app) {
     let rptRouter = express.Router();
     let reportController = require('./../controllers/rpt_controller');
 
     rptRouter.post('/getReport', reportController.getReportAllPages);
-    rptRouter.get('/getExcel/:id/:size/:rptName', reportController.getExcel);
+    rptRouter.get('/getExcel/:id/:size/:rptName/:isOneSheet', reportController.getExcel);
 
     app.use("/report_api", rptRouter);
 };
 
 
->>>>>>> f8110b6237ef0dad71efc308cbf93a13b72b62d3
-