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

wjc

2022-03-11 4564687f2ada89760eda21568baa9cfdc3ff3fa4

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -197,7 +197,7 @@
                        airFresh2.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.DoorLock:
                        var doorLockPage = new DoorLockListPage();
                        var doorLockPage = new DoorLockPage();
                        doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                }