From bd5297c64f39c360a7bf41435a88ae5e70840fc2 Mon Sep 17 00:00:00 2001 From: jace.tang <1536884497@qq.com> Date: 星期二, 14 六月 2022 14:28:54 +0800 Subject: [PATCH] merge --- OPCConfigStruct.cs | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/OPCConfigStruct.cs b/OPCConfigStruct.cs index 2c17c53..aee7268 100644 --- a/OPCConfigStruct.cs +++ b/OPCConfigStruct.cs @@ -143,6 +143,7 @@ public double calibrateHeight; public CompensationZ compensationZ; public CompensationZ compensationW; + public CompensationZ compensationL; public double loadRbtSpeed; public double unloadRbtSpeed; @@ -193,17 +194,15 @@ public string textUploadPath; public string textLine; public string textStation; - - public CompensationZ compensationL; public InfoMember infoMember; //鏍囧噯鍧楅厤缃弬鏁� public LimitRange standardLengthLimit; public LimitRange standardWidthLimit; public LimitRange standardHeightLimit; - public CompensationZ standardCompensationZ; - public CompensationZ standardCompensationL; - public CompensationZ standardCompensationW; + //public CompensationZ standardCompensationZ; + //public CompensationZ standardCompensationL; + //public CompensationZ standardCompensationW; #region add by Patrick public bool IsSaveSizeOKImage; -- Gitblit v1.8.0