Merge branch 'master' into liuyang

LAPTOP-T815PCOQ\25526

2024-11-15 f5c4a7f3bce165fe2c8c6d934f0f49a363a2ea60

 SourceCode/Bond/BondEq/BondEqDlg.cpp

@@ -12,6 +12,9 @@
#include "UserManager.h"
#include "LoginDlg.h"

// test
#include "AxisSettingsDlg.h"


#ifdef _DEBUG
#define new DEBUG_NEW
@@ -538,6 +541,9 @@
            userManager.logout();
            m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
         }

         CAxisSettingsDlg loginDlg;
         loginDlg.DoModal();
      }
   }