Commit a6a2251e authored by zhengyi's avatar zhengyi

Merge branch 'master-fix'

parents 0d7a2d49 57525462
......@@ -6810,6 +6810,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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment