Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2024-11-15 4fafc27775bc8d7ae23fd8d15bae54547d706830

 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();
      }
   }