# Conflicts: # blade-biz-common/src/main/java/org/springblade/common/constant/stockup/StockupTypeConstant.java # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java