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/EAPSimulator.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulator.h b/SourceCode/Bond/EAPSimulator/EAPSimulator.h
index 6b6fc00..0734c5a 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulator.h
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulator.h
@@ -24,6 +24,8 @@
 
 public:
 	CModel m_model;
+	CString m_strAppDir;
+	CString m_strAppFile;
 
 // 閲嶅啓
 public:

--
Gitblit v1.9.3