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/CCjPage3.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CCjPage3.h b/SourceCode/Bond/Servo/CCjPage3.h
index 1593973..95764b3 100644
--- a/SourceCode/Bond/Servo/CCjPage3.h
+++ b/SourceCode/Bond/Servo/CCjPage3.h
@@ -1,5 +1,6 @@
 锘�#pragma once
 #include "CCjPageBase.h"
+#include "CControlJob.h"
 
 
 // CPjPage1 瀵硅瘽妗�
@@ -14,7 +15,9 @@
 
 protected:
 	void Resize();
-	virtual void OnApply();
+	virtual int OnApply();
+	virtual void OnSetContext(void* pContext);
+	void UpdateCjData();
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -28,4 +31,5 @@
 public:
 	virtual BOOL OnInitDialog();
 	afx_msg void OnDestroy();
+	afx_msg void OnEnChangeEditCjId();
 };

--
Gitblit v1.9.3