解决task_298冲突

src/Hotline.Api/Controllers/OrderController.cs

@@ -199,7 +199,7 @@ public class OrderController : BaseController
         Publisher publisher,
         IOrderAnalysisApplication orderAnalysisApplication,
         ICalcExpireTime expireTime,
-        IOptions<CityBaseConfiguration> cityBaseConfiguration)
+        IOptions<CityBaseConfiguration> cityBaseConfiguration,
         IRepository<OrderPushType> orderPushTypeRepository,
         BaseDataApplication baseDataApplication)
     {
@@ -264,7 +264,6 @@ public class OrderController : BaseController
         _orderPushTypeRepository = orderPushTypeRepository;
         _cityBaseConfiguration = cityBaseConfiguration;
         _baseDataApplication = baseDataApplication;
-	}
     }
     #endregion 
 

src/Hotline.Application/Orders/OrderApplication.cs

@@ -135,7 +135,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         IMediator mediator,
         IRepository<OrderVisitDetail> orderVisitedDetailRepository,
         IOptionsSnapshot<AppConfiguration> appOptions,
-        IOptions<CityBaseConfiguration> cityBaseConfiguration)
+        IOptions<CityBaseConfiguration> cityBaseConfiguration,
         ISystemDicDataCacheManager sysDicDataCacheManager,
         Publisher publisher,
         IRepository<TranspondCityRawData> transpondCityRawDataRepository)