From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/UI/MainPage.cs | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 71591b3..21e872a 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -111,7 +111,6 @@
SPK.AirFreshStandard,SPK.HvacAirFresh,
SPK.AirSwitch,
SPK.PanelSocket,SPK.ElectricSocket,
- SPK.HvacCac
};
@@ -133,7 +132,6 @@
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
- _RoomNotSupportFunctionList.AddRange(SPK.PanelSpkList());
}
return _RoomNotSupportFunctionList;
}
--
Gitblit v1.8.0