code merge

modules/reports/routes/report_router.js

@@ -6,13 +6,7 @@ let express = require('express');
 let rptRouter = express.Router();
 let reportController = require('./../controllers/rpt_controller');
 
-<<<<<<< HEAD
-rptRouter.post('/getReport', reportController.getReportAllPages);
-rptRouter.get('/getExcel/:id/:size/:rptName/:isOneSheet', reportController.getExcel);
-=======
 module.exports =function (app) {
->>>>>>> 54307e7bc954a6c634a9960dab54b0f42578bc0f
-
     app.get('/report',  function(req, res) {
         if (!req.session.userAccount) {
             res.redirect('/login');
@@ -24,6 +18,6 @@ module.exports =function (app) {
         }
     });
     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);
 }