解决冲突

src/Hotline.Api/Controllers/OrderController.cs

@@ -7,6 +7,7 @@ using Hotline.Application.Orders;
 using Hotline.Application.Quality;
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Configs;
+using Hotline.ContingencyManagement;
 using Hotline.ContingencyManagement.Notifies;
 using Hotline.Enterprise;
 using Hotline.EventBus;

src/Hotline/Settings/SettingConstants.cs

@@ -384,7 +384,6 @@ namespace Hotline.Settings
 		/// 系统版本地区
 		/// </summary>
 		public const string VersionsAreaCode = "VersionsAreaCode";
-	}
 
         /// <summary>
         /// 系统管理员角色