Merge branch 'WJC' into wxr7

wxr

2021-08-28 ea8f01fd99a2ef85bf96623c1bf90e84128cbe5c

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -526,6 +526,7 @@
                        deviceTypeList.Add(SPK.CurtainRoller);
                        deviceTypeList.Add(SPK.CurtainTrietex);
                        deviceTypeList.Add(SPK.AcStandard);
                        deviceTypeList.Add(SPK.AirFreshStandard);
                        deviceTypeList.Add(SPK.FloorHeatStandard);
                        deviceTypeList.Add(SPK.SensorSmoke);
                        deviceTypeList.Add(SPK.SensorWater);