Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -962,7 +962,11 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);
         //根据时间段查询数据
-        PageHelper.startPage(pageNum, pageSize);
+        if(pageNum ==null && pageSize==null){
+
+        }else {
+            PageHelper.startPage(pageNum, pageSize);
+        }
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getHaveCarTruckNoList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null, saleOrderList);