Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

@@ -642,7 +642,7 @@
                    CloseAllOpenForm();



                    //显示登陆画面

                    var formLogin = new Login.AccountLogin();

                    var formLogin = new Login.AccountLoginForm();

                    Shared.Common.CommonPage.Instance.AddChidren(formLogin);

                    formLogin.ShowForm(account);

                });

@@ -683,7 +683,7 @@
                    CloseAllOpenForm();



                    //显示登陆画面

                    var formLogin = new Login.AccountLogin();

                    var formLogin = new Login.AccountLoginForm();

                    Shared.Common.CommonPage.Instance.AddChidren(formLogin);

                    formLogin.ShowForm(account);

                });