Merge branch 'master-fix' into release

# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -1030,7 +1030,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
         List<OrderItemDO> orderItemVOList = orderItemService.getOrderItemList(orderItemIds);
         AtomicInteger atomicInteger = new AtomicInteger(1);
         Map<String, Object> totalItemMap = new HashMap<>();
-        List<Map<String, Object>> dataList = orderItemVOList.stream().filter(item -> item.getWarehouseInInfoVO() != null).map(item -> {
+        List<Map<String, Object>> dataList = orderItemVOList.stream().filter(item -> item.getWarehouseInInfoVO() != null && item.getWarehouseInInfoVO().getCartonsNum() > 0).map(item -> {
             Map<String, Object> paramMap = new HashMap<>();
             //订单项
             paramMap.put("index", atomicInteger.getAndIncrement());