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

wxr

2022-03-08 f8bafd162ad7adf2f21986389568d650b71f976b

 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs

@@ -912,7 +912,7 @@
                return;
            }
            if (UserInfo.Current.VerOpenDoorPw || string.IsNullOrEmpty(UserInfo.Current.doorPasswordString))
            {
            { 
                var page = new DoorLockUnlockPage(this.device);
                MainPage.BasePageView.AddChidren(page);
                page.LoadView();