From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h b/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h
index f0efa38..97e2d62 100644
--- a/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h
+++ b/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h
@@ -1,6 +1,6 @@
#pragma once
#include "CWriteStep.h"
-#include "CJobDataB.h"
+#include "CJobDataA.h"
namespace SERVO {
@@ -8,7 +8,7 @@
{
public:
CEqCassetteCtrlCmdStep();
- ~CEqCassetteCtrlCmdStep();
+ virtual ~CEqCassetteCtrlCmdStep();
public:
void setCtrlCmdDev(int nDev);
@@ -17,7 +17,7 @@
int jobExistenceSize,
short slotProcess,
short jopCount,
- CJobDataB* pJobDataB);
+ CJobDataA* pJobDataA);
void getAttributeVector(CAttributeVector& attrubutes);
private:
--
Gitblit v1.9.3