Merge branch 'release' into 'jd_dev'

Release分支合并到jd分支011702

See merge request !85

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxMergePkg/BoxMergePkgServiceImpl.java

@@ -610,7 +610,7 @@ public class BoxMergePkgServiceImpl extends AbstractService<BoxMergePkgMapper, B
                 item.setUnits(units);
 
                 // 是否有关联单
-                boolean hasRelationOrder = AllOrderItemDOS.stream().anyMatch(t -> t.getGuanLianOrderCount() > 0);
+                boolean hasRelationOrder = orderItemDOS.stream().anyMatch(t -> t.getGuanLianOrderCount() > 0);
                 item.setHasRelationOrder(hasRelationOrder);
 
                 List<BoxOrderCheckInfoDO> installBox = boxMergePkgMapper.getInstallBoxByShipmentId(shipmentId, item.getOrderId());