Merge branch 'dev' into pre-production

10 months ago · ade9249913
1 changed files with 1 additions and 1 deletions
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@ -240,7 +240,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}

 		distributionStockupVO.setOrderReceiveStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RECEIVE_STATUS, distributionStockupVO.getOrderReceiveStatus()));
-		return null;
+		return distributionStockupVO;
 	}

 	/**