Merge branch 'master' into develop

cdlib · Aug 17, 2017 · 83ba1c8 · 83ba1c8
2 parents e85e986 + a150eb2
commit 83ba1c8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/main/java/org/cdlib/ill/report/api/CampusILLDataRestController.java b/src/main/java/org/cdlib/ill/report/api/CampusILLDataRestController.java
@@ -13,7 +13,6 @@
 import org.cdlib.ill.report.vdx.VdxLending;
 import org.cdlib.ill.report.vdx.VdxBorrowingRepository;
 import org.cdlib.ill.report.vdx.VdxLendingRepository;
-import org.cdlib.ill.report.vdx.procedures.SpVdxLending;
 import org.cdlib.ill.report.vdx.procedures.SpVdxLendingBilling;
 import org.cdlib.ill.report.vdx.procedures.SpVdxLendingBillingRepository;
 import org.cdlib.ill.report.vdx.procedures.SpVdxLendingUnfilledDetail;

diff --git a/src/main/java/org/cdlib/ill/report/api/CampusILLStatisticsRestController.java b/src/main/java/org/cdlib/ill/report/api/CampusILLStatisticsRestController.java
@@ -209,4 +209,5 @@ public void getVdxLendingTat(Writer output,
         List<SpVdxLendingTat> data = spVdxLendingTatRepo.getLendingTat(VdxCampus.fromCode(campusCode).map(VdxCampus::getCode).orElse("%"), startDate, endDate).collect(Collectors.toList());
         mapper.writer(schema).writeValue(output, data);
     }
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -209,4 +209,5 @@ public void getVdxLendingTat(Writer output, @@
             List<SpVdxLendingTat> data = spVdxLendingTatRepo.getLendingTat(VdxCampus.fromCode(campusCode).map(VdxCampus::getCode).orElse("%"), startDate, endDate).collect(Collectors.toList());
             mapper.writer(schema).writeValue(output, data);
         }
     }