From e5d448c95b18b46068453fa95527f1de1f7f0d45 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 08:29:28 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/BondEq/View/LoginDlg.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/LoginDlg.cpp b/SourceCode/Bond/BondEq/View/LoginDlg.cpp
index 947a37d..9dae4f8 100644
--- a/SourceCode/Bond/BondEq/View/LoginDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/LoginDlg.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include "BondServo.h"
+#include "BondEq.h"
 #include "afxdialogex.h"
 #include "LoginDlg.h"
 #include "UserManager.h"
@@ -109,7 +109,6 @@
 void CLoginDlg::OnBnClickedChangePassword()
 {
     CChangePasswordDlg changePasswordDlg;
-    changePasswordDlg.DoModal();
     if (changePasswordDlg.DoModal() == IDOK) {
         m_editPassword.SetWindowText("");
     }

--
Gitblit v1.9.3