From 87bc1140ac4a1dc3e46a322444a80a9ce321b57d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 13:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Wxr
---
HDL_ON/Entity/Function/Function.cs | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index f180034..a562b51 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -277,6 +277,10 @@
/// </summary>
public string extDevId = string.Empty;
/// <summary>
+ /// 鐗╃悊璁惧(妯″潡)鍨嬪彿
+ /// </summary>
+ public string omodel =string.Empty;
+ /// <summary>
/// 璁惧spk
/// </summary>
public string spk = "";
@@ -1411,6 +1415,11 @@
list.Add(DoorLock);
return list;
}
+
+ /// <summary>
+ /// 鐚溂
+ /// </summary>
+ public const string Peephole = "peephole";
/// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣
/// </summary>
--
Gitblit v1.8.0