Merge branch 'tzy2' into MergeFL

wxr

2021-07-05 5a64fc39289d4121b2950c07a4b6e43cf76dd4a5

 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;
                }