Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -4274,7 +4274,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//这里就是取消的预约单，进行状态回退
 			DistributionReservationEntity reservationEntity = n.get(0);
 			reservationEntity.setReservationStatus(ReservationStatusConstant.yiqueren.getValue());
-			reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
+			reservationEntity.setStockupStatus(ReservationStockupStatusConstant.weibeihuo.getValue());
 			distributionReservationMapper.updateById(reservationEntity);
 			//删除配送预约中间表信息
 			distributionSignforMapper.deleteByReservationAndDeliveryId(reservationEntity.getId(), deliveryListEntity.getId());