Merge branch 'dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -182,7 +182,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 			int zeroSize = zeroTotal % size;
 			IPage<ReportDetailVO> page1 = Condition.getPage(query);
 			page1.setCurrent(zeroCurrent);
-			if (ObjectUtil.equals(zeroCurrent, 1)) {
+			if (NumberUtil.equals(zeroCurrent, 1)) {
 				page1.setSize(zeroSize);
 			} else {
 				page1.setSize(size);