Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

src/Hotline.Api/Controllers/OrderController.cs

@@ -1967,7 +1967,7 @@ public class OrderController : BaseController
         try
         {
             //二次回访会改写数据
-            //await _orderRepository.OrderScreenRevisionVisit(visit.Id, false, HttpContext.RequestAborted);
+            await _orderRepository.OrderScreenRevisionVisit(visit.Id, false, HttpContext.RequestAborted);
             var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
             startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderScreen;
             startDto.Opinion = dto.Data.Content;

src/Hotline.Application/Orders/OrderScreenHandler/OrderScreenEndWorkflowHandler.cs

@@ -113,10 +113,10 @@ public class OrderScreenEndWorkflowHandler : INotificationHandler<EndWorkflowNot
 				}
 				else
 				{
-					await _orderRepository.OrderScreenRevisionVisit(screen.VisitId, true, cancellationToken);
 					screen.Status = EScreenStatus.Refuse;
 					screen.ReplyContent = workflow.ActualOpinion;
 				}
+				await _orderRepository.OrderScreenRevisionVisit(screen.VisitId, true, cancellationToken);
 				screen.NewestAuditTime = DateTime.Now;
 				await _orderScreenRepository.UpdateAsync(screen, cancellationToken);
 				OrderScreenDetail detail = new OrderScreenDetail