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

wjc

2022-01-19 07b0239f824ddb5a0cadf93f20ff6247f72baca2

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -243,12 +243,13 @@
                    //etAccount.Text = "info@smartlife-ks.com";
                    //etAccount.Text = "551775569@qq.com";//wcf
                    etAccount.Text = "15626203746";
                    etAccount.Text = "zhangquansongjava@163.com";
                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "18140004933")
                if(etAccount.Text == "zhangquansongjava@163.com")
                {
                    etPassword.Text = "w889900";
                    etPassword.Text = "BVVEAAMZ";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;