合并冲突

src/Hotline.Api/Controllers/OrderController.cs

@@ -84,10 +84,11 @@ public class OrderController : BaseController
         IRepository<OrderDelay> orderDelayRepository,
         ITimeLimitApplication timeLimitApplication,
         ISystemSettingCacheManager systemSettingCacheManager,
-        IOrderRedoRepository orderRedoRepository,
-        IOrderSuperviseRepository orderSuperviseRepository,
-        IOrderUrgeRepository orderUrgeRepository,
-        IFileRepository file
+		 IRepository<OrderRedo> orderRedoRepository,
+		 IRepository<OrderSupervise> orderSuperviseRepository,
+		 IRepository<OrderUrge> orderUrgeRepository,
+        IFileRepository file,
+        IRepository<OrderScreen> orderScreen
 		)
     {
         _orderDomainService = orderDomainService;