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/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h b/SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h
index 6ede559..d7586f6 100644
--- a/SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h
+++ b/SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h
@@ -413,8 +413,8 @@
 	int ResetBitDevice(const StationIdentifier& station, DeviceType enDevType, short enDevNo);
 
 	// 扩展设置/复位对象站的指定位软元件
-	long SetBitDeviceEx(const StationIdentifier& station, long nDevType, long nDevNo);
-	long ResetBitDeviceEx(const StationIdentifier& station, long nDevType, long nDevNo);
+	long SetBitDeviceEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo);
+	long ResetBitDeviceEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo);
 
 	// 执行对象站的CPU
 	int ControlCPU(const StationIdentifier& station, ControlCode enControlCode);

--
Gitblit v1.9.3