合并分支 'bug' 到 'master'

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

@@ -929,19 +929,11 @@ public class JavaToPdfHtmlFreeMarker {
             }
         }
         if (checkList2.size() != 0) {
-            int size=30-i;
-            lists.add(addCheck(checkList2,size));
+            lists.add(checkList2);
         }
         return lists;
     }
 
-    private static List<Check> addCheck(List<Check> checks,Integer size){
-
-        for (int i=0;i<size;i++){
-             checks.add(new Check(null,null,null,null,"",1,"",1));
-        }
-        return checks;
-    }
 
     /**
      * freemarker渲染html  核查确认单据
@@ -2005,19 +1997,11 @@ public class JavaToPdfHtmlFreeMarker {
             }
         }
         if (checkList2.size() != 0) {
-            int size=pageSize-i;
-            lists.add(addExportDevice(checkList2,size));
+            lists.add(checkList2);
         }
         return lists;
     }
 
-    private static List<ExportDevice> addExportDevice(List<ExportDevice> exportDevices,Integer size){
-
-        for (int i=0;i<size;i++){
-            exportDevices.add(new ExportDevice(null,null,null,null,"",1,null,null,1,""));
-        }
-        return exportDevices;
-    }
     private static Map<String,Object> toExportDeviceMap(Confirm confirm, List<ExportDevice> list,Integer page,Integer count,String time){
         Map<String,Object> data = new HashMap();
         data.put("title",confirm.getTitle());