[模版修改] 代码提交

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -144,7 +144,7 @@ public class JavaToPdfHtmlFreeMarker {
     /**
      * freemarker渲染html
      */
-    public static String[] freeMarkerRender1(Documents documents,String htmlPath) {
+    public static String[] freeMarkerRender(Documents documents,String htmlPath) {
         Writer out = new StringWriter();
         String [] strings=new String[100000];
         int index=0;
@@ -183,7 +183,7 @@ public class JavaToPdfHtmlFreeMarker {
     }
 
 
-    public static String[] freeMarkerRender(Documents documents,String htmlPath) {
+    public static String[] freeMarkerRender1(Documents documents,String htmlPath) {
         Writer out = new StringWriter();
         String [] strings=new String[100000];
         int index=0;
@@ -358,7 +358,7 @@ public class JavaToPdfHtmlFreeMarker {
             template.setEncoding("UTF-8");
 
             List<DocumentDevice> list=documents.getDocumentDevices();
-            List<List<DocumentDevice>> listList=toDocList(list);
+            List<List<DocumentDevice>> listList=toList(list);
             int count=listList.size();
             for (int i=1; i<=3; i++){
                 Integer page=1;