From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm

---
 ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs
index a551422..d15698c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs
@@ -127,13 +127,13 @@
         /// </summary>
         /// <param name="newPsw">鏂板瘑鐮�</param>
         /// <param name="newPsw2">浜屾纭瀵嗙爜</param>
-        private async void ResetPassword(string newPsw, string newPsw2)
+        private void ResetPassword(string newPsw, string newPsw2)
         {
             var pra = new ResetPswPra();
             pra.Password = newPsw;
             pra.AgainPassword = newPsw2;
             //鏇存敼瀵嗙爜
-            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ResetPassword", false, pra);
+            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ResetPassword", false, pra);
             if (flage == false)
             {
                 return;

--
Gitblit v1.8.0