Merge branch 'release' into 'jd_dev'

Release分支代码合并到jd分支20241218

See merge request !47

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -6798,6 +6798,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         newOrder.setLockConsigneeDay(null);
         newOrder.setLockConsigneeTime(null);
 //        newOrder.setDisplayBillLadingPrice(null);
+        newOrder.setAdjustToStartWarehouseId(null);
+        newOrder.setAdjustToDestWarehouseId(null);
+        newOrder.setDestAdjustToStartWarehouseId(null);
+        newOrder.setDestAdjustToDestWarehouseId(null);
         // 状态重置
         newOrder.setStatus(DRAFT.getValue());// 默认草稿订单
         newOrder.setCargoControlStatus(null);