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

src/Hotline/Permissions/EPermission.cs

@@ -349,7 +349,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "特提列表", Name = "特提列表", Description = "特提列表")]
         SpecialOrder = 200401,
-
+        /// <summary>
+        /// 数据权限
+        /// </summary>
+        [Display(GroupName ="特提列表",Name ="数据权限",Description ="数据权限")]
+        SpecialDataRole = 200406,
         #endregion
 
         #region 特提待审批
@@ -420,6 +424,15 @@ namespace Hotline.Permissions
         AuditSendBack = 200504,
         #endregion
 
+        #region 退回列表
+        /// <summary>
+        /// 退回列表
+        /// </summary>
+        [Display(GroupName ="退回列表",Name ="退回列表",Description ="退回列表")]
+        OrderPreviousReadList = 200505,
+
+        #endregion
+
         #endregion
 
         #region 催办管理
@@ -574,7 +587,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName ="回访待办",Name ="数据范围",Description ="数据范围")]
         OrderVisitDataRange = 200914,
-
+        /// <summary>
+        /// 工单类型
+        /// </summary>
+        [Display(GroupName ="回访待办",Name ="工单类型",Description ="工单类型")]
+        OrderTypeForVisit = 200915,
         #endregion
 
         #region 回访列表