From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
index d392722..19c31ea 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -93,6 +93,8 @@
/// 浜戠澶╂皵鏉′欢=6;
/// 鏌愪釜閫昏緫/鍦烘櫙鐨勮緭鍑烘潯浠�=7;
/// 鍦扮悊鍥存爮=8;
+ /// 绌烘皵璐ㄩ噺=9;
+ /// 鍦烘櫙=10;
/// </summary>
public string condition_type = "";
public List<Dictionary<string, string>> condition = new List<Dictionary<string, string>>();
@@ -112,10 +114,15 @@
/// </summary>
public string sid = "";
/// <summary>
+ /// 閫昏緫杈撳嚭鐩爣寤舵椂闂�(鍗曚綅鐢ㄧ)
+ /// </summary>
+ public string delay = "0";
+ /// <summary>
/// 閫昏緫杈撳嚭鐩爣绫诲瀷
/// 璁惧=1;
/// 鍦烘櫙=2;
- /// 寤舵椂=3;
+ /// 瀹夐槻=3;
+ /// 寤舵椂=4;
/// </summary>
public string target_type = "";
public List<Dictionary<string, string>> status = new List<Dictionary<string, string>>();
--
Gitblit v1.8.0