Merge branch 'Dev-Wxr' into wjc

wjc

2023-04-11 e74f8bfbe6c52f220deef5fc99a53c3a7872808d

 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();