Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -797,7 +797,7 @@ public class DistributionStockupAppController extends BladeController {
 //									warehouseUpdownGoodsEntity.setAssociationType("4");
 //									WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
 										if(!locationInformation.isEmpty()){
-											if(byId.getServiceType().equals("2")){
+											if(byId.getSourceType().equals("2")){
 												//导入下架
 												entity.setAllocationTitle(locationInformation.get(0).getPositionCode());
 												entity.setAllocationId(stockupDTO.getAllocationId());