From c6402221a27aab8dfdac6e08967041e0c5009612 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 13 四月 2023 16:04:15 +0800
Subject: [PATCH] Merge branch 'dev-cqy(1.5.9)' into wjc

---
 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