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

diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 5767836..1863abd 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -192,6 +192,8 @@
 	int requestEventReportSend(const char* pszEventName);
 	int requestEventReportSend_CarrierID_Readed();
 	int requestEventReportSend_Port_Unload_Ready();
+	int requestEventReportSend_Port_Load_Ready();
+	int requestEventReportSend_Port_Blocked();
 	int requestEventReportSend_PJ_Queued();
 	int requestEventReportSend_PJ_Start();
 	int requestEventReportSend_PJ_End();

--
Gitblit v1.9.3