From c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 02 三月 2021 17:48:32 +0800
Subject: [PATCH] Merge branch 'master' into wjc

---
 Crabtree/SmartHome/HDL/Common/CommonConfig.cs |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/Crabtree/SmartHome/HDL/Common/CommonConfig.cs b/Crabtree/SmartHome/HDL/Common/CommonConfig.cs
index abf39ea..18f35af 100644
--- a/Crabtree/SmartHome/HDL/Common/CommonConfig.cs
+++ b/Crabtree/SmartHome/HDL/Common/CommonConfig.cs
@@ -10,6 +10,14 @@
     {
 		public static readonly string ConfigFile = "CommonConfig";
         /// <summary>
+        /// 璁惧鍒楄〃
+        /// </summary>
+        public List<Function> FunctionList = new List<Function> ();
+        /// <summary>
+        /// 鍦烘櫙鍒楄〃
+        /// </summary>
+        public List<HDLLinkSceneBase> SceneList = new List<HDLLinkSceneBase> ();
+        /// <summary>
         /// 
         /// </summary>
         public HomeGatewayInfo HomeGatewayInfo = null;

--
Gitblit v1.8.0