解决冲突

src/Hotline.Api/Controllers/OrderController.cs

@@ -205,9 +205,8 @@ public class OrderController : BaseController
         ICalcExpireTime expireTime,
         IOptions<CityBaseConfiguration> cityBaseConfiguration,
         IRepository<OrderPushType> orderPushTypeRepository,
-        IOptions<CityBaseConfiguration> cityBaseConfiguration,
         ICallNativeRepository callNativeRepository,
-        ICallNativeApplication callNativeApplication)
+        ICallNativeApplication callNativeApplication,
         BaseDataApplication baseDataApplication)
     {
         _orderDomainService = orderDomainService;
@@ -269,10 +268,8 @@ public class OrderController : BaseController
         _orderAnalysisApplication = orderAnalysisApplication;
         _expireTime = expireTime;
         _orderPushTypeRepository = orderPushTypeRepository;
-        _cityBaseConfiguration = cityBaseConfiguration;
         _callNativeRepository = callNativeRepository;
         _callNativeApplication = callNativeApplication;
-    }
         _baseDataApplication = baseDataApplication;
     }
     #endregion 

src/Hotline.Application.Tests/Application/OrderApplicationTest.cs

@@ -27,7 +27,7 @@ public class OrderApplicationTest
     private readonly IRepository<Message> _messageRepository;
 
 
-    public OrderApplicationTest(IOrderApplication orderApplication, IRepository<OrderVisit> orderVisitRepository, IRepository<Message> messageRepository)
+    public OrderApplicationTest(IOrderApplication orderApplication, IRepository<OrderVisit> orderVisitRepository, IRepository<Message> messageRepository, IRepository<Order> orderRepository, ISystemDicDataCacheManager systemDicDataCacheManager)
     {
         _orderApplication = orderApplication;
         _orderVisitRepository = orderVisitRepository;

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -180,7 +180,6 @@ namespace Hotline.Share.Dtos.Order
         /// 归档方式
         /// </summary>
         public FiledType? FiledType { get; set; }
-	}
         /// <summary>
         /// 省交办编号
         /// </summary>

src/Hotline/Orders/OrderVisitDetail.cs

@@ -111,7 +111,6 @@ namespace Hotline.Orders
             this.SeatEvaluate ??= seatEvaluate;
             this.VoiceEvaluate ??= voiceEvaluate;
         }
-    }
 
 		/// <summary>
 		/// 截至甄别时间