From f0f63edda354eaf18895f0b92ff6d308bd778176 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 07 十二月 2020 11:01:12 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 9 +++++++--
1 files changed, 7 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 c2ede74..a388ffb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -7,6 +7,7 @@
/// </summary>
public class Logic
{
+
/// <summary>
/// 閫昏緫鍒楄〃
/// </summary>
@@ -15,6 +16,10 @@
/// 褰撳墠閫昏緫
/// </summary>
public static Logic currlogic;
+ /// <summary>
+ /// 浜戠鍞竴id
+ /// </summary>
+ public string userLogicId = "";
/// <summary>
/// 閫昏緫鍞竴鏍囪瘑
/// </summary>
@@ -55,7 +60,7 @@
/// 鏃堕棿绫诲瀷
/// (鎵ц涓�娆�:once锛屾瘡澶�:day锛屾瘡鏈�:mon锛屾槦鏈�:week锛屾棩鏈熸:date_to_date)
/// </summary>
- public string type = "";
+ public string type = "day";
public List<string> value = new List<string>();
}
/// <summary>
@@ -94,7 +99,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