code merge

app/view/payment/detail.ejs

@@ -164,7 +164,7 @@
             }
         },
     };
-<<<<<<< HEAD
+
     $(document).ready(() => {
         autoFlashHeight();
         auditRptPrintHelper.showPage();
@@ -176,8 +176,6 @@
         //
         return rst;
     }
-=======
->>>>>>> e642a11f7853fd89a13fff7afc4e0442ca6da1ee
 
     function downloadPDFReport(pageDataArr, pageSize, rpt_names, signatureRelArr, signatureRelInfo, refRptTplIds, STAGE_AUDIT) {
         auditRptPrintHelper.currentDownloadIdx = 0;