From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交

---
 SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h
index e289190..e10cf1a 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h
@@ -62,4 +62,5 @@
 	afx_msg void OnBnClickedButtonQueryCjSpace();
 	afx_msg void OnBnClickedButtonQueryPjSpace();
 	afx_msg void OnBnClickedButtonCreatePj();
+	afx_msg void OnBnClickedButtonCreateCj();
 };

--
Gitblit v1.9.3