From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEqJobEventStep.h | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.h b/SourceCode/Bond/Servo/CEqJobEventStep.h
index f2b1c70..c0cbace 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.h
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.h
@@ -1,6 +1,6 @@
#pragma once
#include "CReadStep.h"
-#include "CJobDataB.h"
+#include "CJobDataS.h"
namespace SERVO {
@@ -8,7 +8,7 @@
{
public:
CEqJobEventStep();
- ~CEqJobEventStep();
+ virtual ~CEqJobEventStep();
public:
virtual void getAttributeVector(CAttributeVector& attrubutes);
@@ -16,11 +16,11 @@
virtual int onComplete();
virtual int onTimeout();
void setJobDataDev(int nDev);
- CJobDataB* getJobDataB();
+ CJobDataS* getJobDataS();
private:
- int m_nJobDataBDev;
- CJobDataB m_jobDataB;
+ int m_nJobDataADev;
+ CJobDataS m_jobDataS;
};
}
--
Gitblit v1.9.3