Merge branch 'master-fix' into release

12c41269 · 332784038@qq.com · 6497a7b4 · bb93b5dc · 12c41269
Commit 12c41269 authored Dec 27, 2024 by 332784038@qq.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

OrderServiceImpl.java ...dao/module/order/service/order/impl/OrderServiceImpl.java +1 -0

No files found.
--- a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
+++ b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
@@ -5920,6 +5920,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                if (Objects.isNull(consigneeDO.getId())){
                    consigneeDO.setUpdateTime(consigneeVO.getCreateTime());
                    consigneeDO.setUpdater(consigneeVO.getCreator());
+                    consigneeDO.setOrderId(orderBackVO.getOrderId());
                }
                orderConsigneeService.saveOrUpdate(consigneeDO);
                if (orderBackVO.getIsCargoControl()) {