Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-06-10 cf145d2d389c9d45ec0fd8bfa853d3481c29910e

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

@@ -630,7 +630,7 @@
                functionTypeList.Add(SPK.ElectricSocket);
                functionTypeList.Add(SPK.HvacCac);
                functionTypeList.Add(SPK.SensorHelp);

                functionTypeList.Add(SPK.DoorLock);
            }