Merge branch 'dev' into dev-temp

hxb

2022-08-29 9a4629512ccf8359efd88671c9317c3cc7faf0c8

 ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs

@@ -116,7 +116,7 @@
            //界面直接关闭

            this.CloseForm();



            if (HdlFormLogic.Current.IsFormOpen("PasswordUserEditorForm") == false)

            if (UserCenterResourse.DicActionForm.ContainsKey("PasswordUserEditorForm") == false)

            {

                var form = new PasswordUserEditorForm();

                form.AddForm(this.pswNo, pswValue1, i_titleText);