Merge branch 'dev' into pre-production

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

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