Merge branch 'dev' into pre-production

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -458,6 +458,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			aftersaleSurveyRecord.setDifference("1");
 			aftersaleSurveyRecord.setWorkOrderId(aftersalesWorkOrder.getId());
 			aftersaleSurveyRecord.setProcessingResults(surveyRecordDTO.getContent());
+			aftersaleSurveyRecord.setProcessorId(user.getUserId());
+			aftersaleSurveyRecord.setProcessorName(user.getNickName());
 			aftersaleSurveyRecordService.save(aftersaleSurveyRecord);
 		}
 		//添加责任方 处理方

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTaryAllocationServiceImpl.java

@@ -39,7 +39,7 @@ public class WarehouseTaryAllocationServiceImpl extends BaseServiceImpl<Warehous
 		WarehouseTaryAllocationEntity taryAllocationEntity = baseMapper.selectOne(queryWrapper);
 		if(Objects.isNull(taryAllocationEntity)){
 			return null;
-		}else{
+		} else {
 			return taryAllocationEntity.getAllocationId();
 		}
 	}