解决冲突

src/Hotline/Settings/SettingConstants.cs

@@ -667,15 +667,5 @@ namespace Hotline.Settings
         /// 小程序Banner集合
         /// </summary>
         public static string AppBanner = "小程序Banner";
-
-		/// <summary>
-		/// 部门满意度明细不显示工单
-		/// </summary>
-		public const string OrgVisitDetailHiddenOrderNo = "OrgVisitDetailHiddenOrderNo";
-
-        /// <summary>
-        /// 交办单是否保密
-        /// </summary>
-        public const string IsTheAssignmentFormConfidential = "IsTheAssignmentFormConfidential";
     }
 }