Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -1821,9 +1821,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			String[] split = id.split(",");
 			distributionSignforVO.setIds(Arrays.asList(split));
 		}
-		List<DistributionSignforVO> distributionSignforList = baseMapper.exportDistributionSignforOwn(distributionSignforVO);
+//		List<DistributionSignforVO> distributionSignforList = baseMapper.exportDistributionSignforOwn(distributionSignforVO);
 		List<DistributionSignforExcel> list = new ArrayList<>();
-		distributionSignforList.forEach(d -> {
+		distributionSignforVOS.forEach(d -> {
 //			distributionSignfor.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionSignfor.getType()));
 			DistributionSignforExcel signforExcel = new DistributionSignforExcel();
 			BeanUtils.copyProperties(d, signforExcel);