合并冲突

src/Hotline/Settings/SettingConstants.cs

@@ -668,16 +668,6 @@ namespace Hotline.Settings
         /// </summary>
         public static string AppBanner = "小程序Banner";
 
-		/// <summary>
-		/// 部门满意度明细不显示工单
-		/// </summary>
-		public const string OrgVisitDetailHiddenOrderNo = "OrgVisitDetailHiddenOrderNo";
-
-        /// <summary>
-        /// 交办单是否保密
-        /// </summary>
-        public const string IsTheAssignmentFormConfidential = "IsTheAssignmentFormConfidential";
-
         /// <summary>
         /// 网格员回复等待时间(单位:小时)
         /// 超过该时间自动退回工单