解决冲突

src/Hotline.Api/Controllers/TestController.cs

@@ -200,7 +200,6 @@ ICallApplication callApplication,
         ICallNativeRepository callNativeRepository,
         IRepository<OldSendProData> oldSendProDataRepository,
         IThirdIdentiyService thirdIdentiyService,
-        IRepository<OldSendProData> oldSendProDataRepository,
 		IOrderScreenRepository orderScreenRepository,
 		IRepository<OrderVisit> orderVisitRepository
 		)

src/Hotline.Application/Orders/IOrderApplication.cs

@@ -409,5 +409,11 @@ namespace Hotline.Application.Orders
         /// <param name="dto"></param>
         /// <returns></returns>
         ISugarQueryable<OrderTsDetailsDto> QueryKnowledgeQuoteList(PagedKeywordRequest dto);
+
+        /// <summary>
+        /// 将工单从网格员节点办理至工单标记节点
+        /// </summary>
+        /// <returns></returns>
+        Task HandleFromWanggeyuanToMaskAsync(string orderId, CancellationToken cancellation);
     }
 }