Merge branch 'dev' into pre-production

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

@@ -493,6 +493,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionSignfor.setSigningTime(sdf.format(new Date()));
 		distributionSignfor.setExamineUserName(user.getNickName());
 		this.updatePicture(distributionSignforDTO);
+		this.updateById(distributionSignforDTO);
 
 		distributionAsyncService.sendReviewFactory(distributionSignforDTO.getId(),myCurrentWarehouse.getName(), myCurrentWarehouse.getId());
 		//还需要对未装车未签收的包件进行状态的回退
@@ -4118,6 +4119,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
+	@Transactional
 	public Boolean updatePicture(DistributionSignforDTO distributionSignfor) {
 
 		if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {