Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -2756,7 +2756,7 @@ public class OrderController : BaseController
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    [Permission(EPermission.SpecialOrderList)]
+    [Permission(EPermission.AuditSpecialOrderList)]
     [HttpGet("special/list")]
     public async Task<PagedDto<OrderSpecialDto>> List([FromQuery] OrderSpecialListDto dto)
     {

src/Hotline/Permissions/EPermission.cs

@@ -498,13 +498,13 @@ namespace Hotline.Permissions
         [Display(GroupName = "特提申请",Name ="特提申请",Description ="特提申请")]
         SpecialOrder = 201200,
 
-        /// <summary>
-		///工单特提列表
+		/// <summary>
+		///工单特提申请列表
 		/// </summary>
-		[Display(GroupName = "OrderSpecial", Name = "工单特提列表", Description = "工单特提列表")]
-        SpecialOrderList = 201201,
+		[Display(GroupName = "特提申请", Name = "工单特提申请列表", Description = "工单特提申请列表")]
+		ApplySpecialOrderList = 201201,
 
-        /// <summary>
+		/// <summary>
 		/// 特提申请
 		/// </summary>
 		[Display(GroupName = "特提申请", Name = "特提申请", Description = "特提申请")]
@@ -519,12 +519,12 @@ namespace Hotline.Permissions
         SpecialOrderApply = 201300,
 
         /// <summary>
-		///工单特提申请列表
-		/// </summary>
-		[Display(GroupName = "特提审核", Name = "工单特提申请列表", Description = "工单特提申请列表")]
-        ApplySpecialOrderList = 201301,
+        ///工单特提列表
+        /// </summary>
+        [Display(GroupName = "特提审核", Name = "工单特提列表", Description = "工单特提列表")]
+        AuditSpecialOrderList = 201301,
 
-        /// <summary>
+		/// <summary>
 		/// 特提审核
 		/// </summary>
 		[Display(GroupName = "特提审核", Name = "特提审核", Description = "特提审核")]