From c8dfa6df784741900a4c06918929d3db3c876234 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 16 七月 2021 10:40:56 +0800
Subject: [PATCH] Merge branch 'hxb-test' into wxr7-ez

---
 HDL_ON/UI/UI2/2-Classification/RoomPage.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 64eaf63..9b05c24 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -77,7 +77,7 @@
 
             foreach (var function in room.GetRoomFunctions(false))
             {
-                if (function.Spk_Prefix == FunctionCategory.Sensor)
+                if (function.Spk_Prefix == FunctionCategory.Sensor || function.spk == SPK.ElectricEnergy)
                 {
                     continue;
                 }

--
Gitblit v1.8.0