合并冲突

src/Hotline.Application/Orders/OrderApplication.cs

@@ -98,10 +98,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         IRepository<SystemArea> systemAreaRepository,
         IRepository<Hotspot> hotspotRepository,
         IRepository<WorkflowStep> workflowStepRepository,
-        IRepository<SystemDicData> systemDicDataRepository
-		)
-        IRepository<WorkflowStep> workflowStepRepository
-,
+        IRepository<SystemDicData> systemDicDataRepository,
         IRepository<WorkflowTrace> workflowTraceRepository)
     {
         _orderDomainService = orderDomainService;
@@ -125,8 +122,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         _hotspotRepository = hotspotRepository;
         _workflowStepRepository = workflowStepRepository;
         _systemDicDataRepository = systemDicDataRepository;
-
-	}
         _workflowTraceRepository = workflowTraceRepository;
     }