From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/Entity/Function/SecurityAlarm.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/SecurityAlarm.cs b/HDL_ON/Entity/Function/SecurityAlarm.cs
index ea29373..fa1a558 100644
--- a/HDL_ON/Entity/Function/SecurityAlarm.cs
+++ b/HDL_ON/Entity/Function/SecurityAlarm.cs
@@ -33,6 +33,10 @@
/// </summary>
public string delay ="0";
/// <summary>
+ /// 鎶ヨ寤舵椂
+ /// </summary>
+ public string output_delay = "0";
+ /// <summary>
/// 鐘舵��
/// 甯冮槻:enable
/// 鎾掗槻:disable
@@ -272,9 +276,9 @@
/// </summary>
public string sid;
/// <summary>
- /// Bypass璁剧疆 true:鍚敤涓�乫alse:涓存椂bypass涓�
+ /// Bypass璁剧疆 false:鍚敤涓�乼rue:涓存椂bypass涓�
/// </summary>
- public string bypass;
+ public string bypass = "false";
/// <summary>
/// 瀹夐槻杈撳叆鏉′欢
/// </summary>
@@ -457,6 +461,10 @@
/// 鍊�
/// </summary>
public string value;
+ /// <summary>
+ /// Bypass璁剧疆 true:涓存椂bypass涓�乫alse:鍚敤涓�
+ /// </summary>
+ public bool bypass = false;
}
/// <summary>
@@ -483,7 +491,7 @@
/// <summary>
/// 鏈湴涓嶅瓨鍦ㄦ暟鎹紙鏁版嵁鍙兘琚垹浜嗭級
/// </summary>
- public bool NoLocalData ()
+ public bool LocalData ()
{
var function = FunctionList.List.GetLightList().Find((obj) => obj.sid == sid);
if (function != null)
--
Gitblit v1.8.0