Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -59,6 +59,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 			distributionStockupVO.setStoreTime(days + "天");
 		}
 
+		if(ObjectUtils.isNotNull(entity.getCompleteSet())){
 			switch (entity.getCompleteSet()) {
 				case 1:
 					distributionStockupVO.setCompleteSetName("否");
@@ -67,6 +68,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 					distributionStockupVO.setCompleteSetName("是");
 					break;
 			}
+		}
 		buildVoInfor(distributionStockupVO);
 		return distributionStockupVO;
 	}