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

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

@@ -184,7 +184,11 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         if("yes".equals(isPage)){
             return success(bmstruckDetailsOrderService.getInwardWeightDetailsOrder(mapValue,orderType));
         }
-        PageHelper.startPage(pageNum, pageSize);
+        if (pageNum==null||pageSize==null){
+
+        }else {
+            PageHelper.startPage(pageNum, pageSize);
+        }
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getInwardWeightDetailsOrder(mapValue,orderType);
         PageListAdd data = columnDataUtil.tableColumnData5(apiId, null, columnList);