From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
index 2cd57e7..95f9f48 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -8,6 +8,10 @@
public class Logic
{
/// <summary>
+ /// 閫昏緫鍒楄〃
+ /// </summary>
+ public static List<Logic> LogicList = new List<Logic>();
+ /// <summary>
/// 褰撳墠閫昏緫
/// </summary>
public static Logic currlogic;
@@ -51,7 +55,7 @@
/// 鏃堕棿绫诲瀷
/// (鎵ц涓�娆�:once锛屾瘡澶�:day锛屾瘡鏈�:mon锛屾槦鏈�:week锛屾棩鏈熸:date_to_date)
/// </summary>
- public string type = "";
+ public string type = "day";
public List<string> value = new List<string>();
}
/// <summary>
@@ -90,7 +94,7 @@
/// 閫昏緫杈撳嚭鐩爣绫诲瀷
/// 璁惧=1;
/// 鍦烘櫙=2;
- /// 瀹夐槻=3;
+ /// 寤舵椂=3;
/// </summary>
public string target_type = "";
public List<Dictionary<string, string>> status = new List<Dictionary<string, string>>();
--
Gitblit v1.8.0