Merge branch 'master' into net6.0

2022-04-04 08:27:47 +08:00
parent 030db5b971 2bc336ebb2
commit 8fd6bba2d1
29 changed files with 1468 additions and 208 deletions
--- a/ZR.Model/System/Dto/TasksDto.cs
+++ b/ZR.Model/System/Dto/TasksDto.cs
@@ -112,6 +112,11 @@ namespace ZR.Model.System.Dto
        /// </summary>
        [Display(Name = "传入参数")]
        public string JobParams { get; set; }
+        public string ApiUrl { get; set; }
+        /// <summary>
+        /// 1、程序集任务 2、apiUrl任务
+        /// </summary>
+        public int TaskType { get; set; }
    }

    /// <summary>
@@ -219,6 +224,10 @@ namespace ZR.Model.System.Dto
        /// </summary>
        [Display(Name = "传入参数")]
        public string JobParams { get; set; }
+        public string ApiUrl { get; set; }
+        /// <summary>
+        /// 1、程序集任务 2、apiUrl任务
+        /// </summary>
+        public int TaskType { get; set; }
    }
-
 }