Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -521,7 +521,7 @@ public class SupCertController {
         }
 
         String param = JSON.toJSONString(list);
-        JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
     }
 
     /**
@@ -587,7 +587,7 @@ public class SupCertController {
         }
 
         String param = JSON.toJSONString(list);
-        JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
     }
 
     //首营预览文件