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

wxr

2023-04-11 87bc1140ac4a1dc3e46a322444a80a9ce321b57d

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

@@ -182,6 +182,7 @@
                if (agreeBtn.IsSelected)
                {
                    UserInfo.Current.doorPasswordString = password;
                    UserInfo.Current.LastTimeOpenDoor = DateTime.Now;
                }
                Control.Ins.OneKeyUnlocking(this.device, etPassword.Text.Trim());
                this.RemoveFromParent();