Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

src/Hotline/Permissions/EPermission.cs

@@ -311,6 +311,12 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "业务管理", Name = "申请甄别", Description = "申请甄别")]
         ApplyScreen = 200305,
+
+        /// <summary>
+        /// 修改甄别提起时限
+        /// </summary>
+        [Display(GroupName ="业务管理",Name ="修改甄别提起时限",Description = "修改甄别提起时限")]
+        ModifyScreenTimeLimit = 200309,
         #endregion
 
 
@@ -851,6 +857,25 @@ namespace Hotline.Permissions
 
         #endregion
         #endregion
+
+        #region 工单修改
+        /// <summary>
+        /// 工单修改列表
+        /// </summary>
+        [Display(GroupName ="工单修改列表",Name = "工单修改列表", Description = "工单修改列表")]
+        ModifyOrderList = 201600,
+        /// <summary>
+        /// 交办单导出
+        /// </summary>
+        [Display(GroupName ="工单修改",Name ="交办单导出",Description ="交办单导出")]
+        ModifyOrderOrderJbdExport = 201601,
+
+        /// <summary>
+        /// 工单修改
+        /// </summary>
+        [Display(GroupName ="工单修改",Name ="工单修改",Description ="工单修改")]
+        ModifyOrder = 201602,
+        #endregion
         #endregion
 
         #region 质检管理（40,00,00）
@@ -1965,6 +1990,17 @@ namespace Hotline.Permissions
         [Display(GroupName ="外部市民管理",Name ="模板下载",Description ="模板下载")]
         ExtemaiCitzenTemplateDown = 701302,
 
+        /// <summary>
+        /// 外部市民修改
+        /// </summary>
+        [Display(GroupName ="外部市民管理",Name ="外部市民修改",Description ="外部市民修改")]
+        ExtemaiCitzenModify = 701303,
+        /// <summary>
+        /// 外部市民删除
+        /// </summary>
+        [Display(GroupName ="外部市民管理",Name ="外部市民删除",Description ="外部市民删除")]
+        ExtemaiCitzenDel = 701304,
+
         #endregion
 
         #region 短信任务