From 132dc0402e0c5e22a7d54cdddc1700a1842304bd Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 十二月 2022 15:42:23 +0800
Subject: [PATCH] Merge branch 'wjc' into dev--wxr
---
HDL_ON/Entity/Function/Function.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 8737837..e7a7da8 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -273,6 +273,10 @@
/// </summary>
public string deviceId = "0";
/// <summary>
+ /// 绗笁鏂硅澶囨墿灞昳d
+ /// </summary>
+ public string extDevId = string.Empty;
+ /// <summary>
/// 璁惧spk
/// </summary>
public string spk = "";
@@ -1322,6 +1326,10 @@
/// </summary>
public const string OtherCommon = "other.common";
/// <summary>
+ /// 澶у崕鎽勫儚澶�
+ /// </summary>
+ public const string IpCam_Imou = "security.ipcam.imou";
+ /// <summary>
/// 鏈烘鎵�
/// </summary>
public const string MechanicalArm = "electrical.mechanical_arm";
--
Gitblit v1.8.0