From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CJobDataC.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataC.h b/SourceCode/Bond/Servo/CJobDataC.h
index 6b8189f..ecb8d4c 100644
--- a/SourceCode/Bond/Servo/CJobDataC.h
+++ b/SourceCode/Bond/Servo/CJobDataC.h
@@ -6,9 +6,11 @@
{
public:
CJobDataC();
- ~CJobDataC();
+ virtual ~CJobDataC();
public:
+ void* getOwner();
+ void setOwner(void* pOwner);
int getCassetteSequenceNo();
void setCassetteSequenceNo(int no);
std::string& getCassetteId();
@@ -21,6 +23,7 @@
void setMasterRecipe(const char* pszRecipe);
private:
+ void* m_pOwner;
int m_nCassetteSequenceNo;
std::string m_strCassetteId;
std::string m_strCassetteJudge;
--
Gitblit v1.9.3