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/x64/Debug/VariableList.txt |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/x64/Debug/VariableList.txt b/SourceCode/Bond/x64/Debug/VariableList.txt
index 917d572..659b40e 100644
--- a/SourceCode/Bond/x64/Debug/VariableList.txt
+++ b/SourceCode/Bond/x64/Debug/VariableList.txt
@@ -41,4 +41,9 @@
 5004,PJStartID,A20,PJStartID
 5005,PJEndID,A20,PJEndID
 5006,PanelStartID,A20,PanelStartID
-5007,PanelEndID,A20,PanelEndID
\ No newline at end of file
+5007,PanelEndID,A20,PanelEndID
+5008,CJStartID,A20,CJStartID
+5009,CJEndID,A20,CJEndID
+5010,UnloadReadyPortId,U2,"Port ID"
+5011,LoadReadyPortId,U2,"Port ID"
+5012,BlockedPortId,U2,"Port ID"
\ No newline at end of file

--
Gitblit v1.9.3