From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
index 686afe8..73f68c0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
@@ -1,4 +1,7 @@
锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.Entity;
+
namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
{
public class ObjectClass
@@ -7,9 +10,9 @@
}
/// <summary>
- /// 鐢ㄦ埛淇℃伅(钀ょ煶瑙嗛闂ㄩ攣)
+ /// 鐢ㄦ埛淇℃伅(钀ょ煶瑙嗛闂ㄩ攣)
/// </summary>
- public class UserInfo
+ public class UserVideoDoorLockInfo
{
/// <summary>
/// 鐢ㄦ埛id
@@ -53,6 +56,29 @@
}
/// <summary>
+ /// 鑾峰彇闂ㄩ攣鍒楄〃
+ /// </summary>
+ public class DoorLockList
+ {
+ /// <summary>
+ /// 闂ㄩ攣璁惧鍒楄〃
+ /// </summary>
+ public List<Function> list = new List<Function>();
+ }
+ /// <summary>
+ /// 闂ㄩ攣鍨嬪彿鍒楄〃
+ /// </summary>
+ public class LockModels {
+ /// <summary>
+ /// 鍨嬪彿鍒楄〃
+ /// </summary>
+ public List<string> lockModels = new List<string>();
+ /// <summary>
+ /// 鍨嬪彿鍒楄〃
+ /// </summary>
+ public List<string> notAllowedConfigNetworkModels = new List<string>();
+ }
+ /// <summary>
/// 鎺ㄩ�佸唴瀹瑰璞�
/// </summary>
public class ExpantContent
--
Gitblit v1.8.0