Merge branch 'Dev-Branch' into wxr-2.1

wxr

2023-09-25 4e7c1dd0767d551ec3194ead9f3de0a219a802c3

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -326,7 +326,10 @@
                    //etAccount.Text = "12345678904";//2.0 测试  萤石
                    etAccount.Text = "18316672920";
                    etAccount.Text = "18244942707";
                    etAccount.Text = "1272061968@qq.com";//万科城市之光E区8栋206
                    etAccount.Text = "18933160333";
                    etAccount.Text = "18402017839";//wjc

                }
                else
                {
@@ -344,7 +347,6 @@
                    //etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "18814122445";//董泽斌 天河办公室
                    //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
                    //etAccount.Text = "18402017839";//wjc
                    //etAccount.Text = "13430286286";//cwc
                    //etAccount.Text = "13709260805";
                    //etAccount.Text = "support5@hdlchina.com.cn";
@@ -378,9 +380,9 @@
                else if (etAccount.Text == "18100573477")
                {
                    etPassword.Text = "huang12345";
                }else if(etAccount.Text == "15006564444")
                }else if(etAccount.Text == "1272061968@qq.com")
                {
                    etPassword.Text = "zht626800";
                    etPassword.Text = "a123456";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;