Merge branch 'dev' into pre-production

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

@@ -1175,7 +1175,7 @@ public class DistributionStockupAppController extends BladeController {
 				DistributionStockListEntity byId1 = distributionStockListService.getById(stockupDTO.getStockListId());
 				log.info("##################stockupScan: 库存品扫码，库存品id{}",byId1);
 				if (!ObjectUtils.isNull(byId1)) {
-					stockupDTO.setMallName(byId1.getMallName());
+					stockupDTO.setMallName(byId1.getMarketName());
 				}
 			}