From f5c4a7f3bce165fe2c8c6d934f0f49a363a2ea60 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期五, 15 十一月 2024 09:19:31 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 68d4d34..21935a5 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/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();
}
}
--
Gitblit v1.9.3