Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/report/js/rpt_print.js

@@ -57,7 +57,7 @@ let rptPrintHelper = {
                     sessionStorage.pageSize = rptControlObj.getCurrentPageSize();
                     sessionStorage.orientation = rptControlObj.getCurrentOrientation();
                     sessionStorage.scaleFactor = 1;
-                    sessionStorage.closeWaterMark = rptControlObj.getCloseWatermark();
+                    sessionStorage.closeWaterMark = getCloseWatermark();
                     if (sessionStorage.pageSize === 'A3') {
                         window.open('/printReport/A3');
                     } else {