From 43b6e3d6a3a96e7b759b396df4f141ab105fb6bb Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 11:31:58 +0800
Subject: [PATCH] 合并嘉乐代码并测试通过

---
 HDL_ON/Entity/DB_ResidenceData.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 7efc81b..8cbd2a2 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -91,9 +91,9 @@
                                     ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
                                     ShowFunction.FloorHeating,ShowFunction.Music,
                                     ShowFunction.Electric,ShowFunction.Environmental,
-                                    //ShowFunction.EnergyMonitoring,
-                                    //ShowFunction.FreshAir,ShowFunction.DoorLock,
-                                    //ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+                                    ShowFunction.EnergyMonitoring,
+                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
+                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                     ShowFunction.Sensor,ShowFunction.VideoIntercom
                                 });
                             instance.SaveResidenceData();

--
Gitblit v1.8.0