Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-06-30 0b5b6ec781a8cb3400ad34693792bad07e97a00c

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

@@ -631,7 +631,6 @@
                functionTypeList.Add(SPK.HvacCac);
                functionTypeList.Add(SPK.SensorHelp);
                functionTypeList.Add(SPK.DoorLock);

            }