From 0724ea6f2d5b5a654c92d57e06b79c0d09dd4724 Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期四, 08 五月 2025 09:40:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs b/Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs
index 311ab70..d18d68d 100644
--- a/Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs
+++ b/Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs
@@ -95,8 +95,8 @@
[SugarColumn(IsIgnore = true)]
public string Status => Triggers?.FirstOrDefault()?.StatusStr + "," + Triggers?.FirstOrDefault()?.StatusStr.GetEnum<TSK_TRIG.Statuss>().GetDesc() ?? TSK_TRIG.Statuss.Ready.GetName() + "," + TSK_TRIG.Statuss.Ready.GetDesc();
- [SugarColumn(IsIgnore = true)]
- public int Period => Convert.ToInt32(Triggers?.FirstOrDefault()?.Args ?? $"2");
+ //[SugarColumn(IsIgnore = true)]
+ //public int Period => Convert.ToInt32(Triggers?.FirstOrDefault()?.Args ?? $"2");
[SugarColumn(IsIgnore = true)]
public int uPeriod { get; set; }
@@ -160,6 +160,8 @@
public class FluentJobParam: TskJobParam
{
+ public string AssemblyName { get; set; }
+ public string DataType { get; set; }
/// <summary>
/// 鍙傛暟
--
Gitblit v1.9.3