解决合并冲突

src/Hotline/Settings/SettingConstants.cs

@@ -698,11 +698,5 @@ namespace Hotline.Settings
         /// 启用随手拍功能
         /// </summary>
         public const string Snapshot = "Snapshot";
-
-        /// <summary>
-        /// 网格员回复等待时间(单位:小时)
-        /// 超过该时间自动退回工单
-        /// </summary>
-        public const string OvertimeBack = "OvertimeBack";
     }
 }