Merge branch 'dev' into pre-production

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

@@ -868,6 +868,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			listEntity.setQuantityStock(quantity + quantityStock);
 			distributionStockListService.updateById(listEntity);
 		} else {
+			log.info("###########distributionStockListEntity>>>>>>>>,{}",distributionStockListEntity);
 			distributionStockListService.save(distributionStockListEntity);
 		}
 //		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘