code merged sync

app/controller/payment_controller.js

@@ -236,18 +236,14 @@ module.exports = app => {
                     for (const rpt of rptProjectList) {
                         const rptTpl = await ctx.service.rptTpl.getDataById(rpt.ID);
                         // 根据模板ID获取报表JSON
-                        //* 
                         const pageRst = ctx.service.jpcReport.getAllPreviewPagesCommon(rptTpl, 'A4');
-<<<<<<< HEAD
-                        /* /
+                        /*
                         //--------------------
                         params.rpt_tpl_id = rpt.ID;
                         const actRptTpl = JSON.parse(rptTpl.rpt_content);
                         const pageRst = await ctx.service.jpcReport.getAllPagesCommon(ctx, actRptTpl, params, JV.PAGING_OPTION_NORMAL, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir, null);
-                        // */
-=======
+                        */
                         rptTplList.push(pageRst.items[0]);
->>>>>>> 35a81d9688de9c26a0cda92a957e370bc8a7f4d6
                     }
                 }
                 const renderData = {