From 7d9ce4a2ba0a6a338797f30bdd056768a740605c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 20 六月 2025 16:52:04 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/Servo/CGlass.h |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 3374f84..f5e1945 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -28,9 +28,8 @@
 		CPath* getPath();
 		void addPath(unsigned int nEqId, unsigned int nUnit);
 		void serialize(CArchive& ar);
-		void setJobDataB(CJobDataB* pJobDataB);
-		CJobDataB* getJobDataB();
 		void setJobDataS(CJobDataS* pJobDataS);
+		void updateJobDataS(CJobDataS* pJobDataS);
 		CJobDataS* getJobDataS();
 		BOOL setBuddy(CGlass* pGlass);
 		BOOL forceSetBuddy(CGlass* pGlass);
@@ -43,7 +42,6 @@
 		MaterialsType m_type;
 		std::string m_strID;
 		CPath* m_pPath;
-		CJobDataB m_jobDataB;
 		CJobDataS m_jobDataS;
 		CGlass* m_pBuddy;
 		std::string m_strBuddyId;

--
Gitblit v1.9.3