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/CJobDataS.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h index 8f5bae6..87b1cde 100644 --- a/SourceCode/Bond/Servo/CJobDataS.h +++ b/SourceCode/Bond/Servo/CJobDataS.h @@ -9,9 +9,11 @@ public: CJobDataS(); CJobDataS::CJobDataS(CJobDataS&& other) noexcept; - ~CJobDataS(); + virtual ~CJobDataS(); public: + void* getOwner(); + void setOwner(void* pOwner); void copy(CJobDataS* pScr); int getCassetteSequenceNo(); void setCassetteSequenceNo(int no); @@ -77,6 +79,7 @@ private: + void* m_pOwner; int m_nCassetteSequenceNo; int m_nJobSequenceNo; std::string m_strLotId; -- Gitblit v1.9.3