Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2024-11-15 106787bbf3418e9199043bcea81d29161fdada8f

 SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp

@@ -2,7 +2,7 @@
//

#include "stdafx.h"
#include "BondServo.h"
#include "BondEq.h"
#include "afxdialogex.h"
#include "ChangePasswordDlg.h"
#include "UserManager.h"
@@ -82,6 +82,11 @@
        return;
    }

    if (newPassword.Compare(currentPassword) == 0) {
        EndDialog(IDCANCEL);
        return;
    }

#ifdef UNICODE
    std::string strUsername = CStringA(username);
    std::string strCurrentPassword = CStringA(currentPassword);