diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java
index 8fbfd5e13..e324352b0 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java
@@ -26,7 +26,7 @@ public class CuttingSettingDO extends ESDocument {
     @Schema(description = "默认0，工位1原点位置")
     private Integer originPoIntegerPosition;
     @Schema(description = "工作原点Z0基准面")
-    private String originZ0Position;
+    private Integer originZ0Position;
     @Schema(description = "排版基准点")
     private String layoutBenchmark;
     @Schema(description = "排版基准点跟随大板定位")
@@ -249,17 +249,17 @@ public class CuttingSettingDO extends ESDocument {
     @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
     private List<String> exportOrderPathName;
     @Schema(description = "大板NC正(A)面文件名")
-    private String largePlateNcPositiveFileName;
+    private List<String> largePlateNcPositiveFileName;
     @Schema(description = "大板NC反(B)面文件名")
-    private String largePlateNcNegativeFileName;
+    private List<String> largePlateNcNegativeFileName;
     @Schema(description = "小板NC正(A)面文件名")
-    private String smallPlateNcPositiveFileName;
+    private List<String> smallPlateNcPositiveFileName;
     @Schema(description = "小板NC反(B)面文件名")
-    private String smallPlateNcNegativeFileName;
+    private List<String> smallPlateNcNegativeFileName;
     @Schema(description = "大板DXF(排版图)文件名")
-    private String largePlateDxfLayoutFileName;
+    private List<String> largePlateDxfLayoutFileName;
     @Schema(description = "小板DXF(孔槽加工图)文件名")
-    private String smallPlateDxfProcessingFileName;
+    private List<String> smallPlateDxfProcessingFileName;
     @Schema(description = "导出大板NC反(B)面文件")
     private String exportLargePlateNcNegativeFile;
     @Schema(description = "合并大板NC正反(AB)面文件")
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java
index 39558335b..b16b85039 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java
@@ -30,7 +30,7 @@ public class CuttingTemplateMachineDO extends ESDocument {
     @Schema(description = "默认0，工位1原点位置")
     private Integer originPoIntegerPosition;
     @Schema(description = "工作原点Z0基准面")
-    private String originZ0Position;
+    private Integer originZ0Position;
     @Schema(description = "排版基准点")
     private String layoutBenchmark;
     @Schema(description = "排版基准点跟随大板定位")
@@ -253,17 +253,17 @@ public class CuttingTemplateMachineDO extends ESDocument {
     @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
     private List<String> exportOrderPathName;
     @Schema(description = "大板NC正(A)面文件名")
-    private String largePlateNcPositiveFileName;
+    private List<String> largePlateNcPositiveFileName;
     @Schema(description = "大板NC反(B)面文件名")
-    private String largePlateNcNegativeFileName;
+    private List<String> largePlateNcNegativeFileName;
     @Schema(description = "小板NC正(A)面文件名")
-    private String smallPlateNcPositiveFileName;
+    private List<String> smallPlateNcPositiveFileName;
     @Schema(description = "小板NC反(B)面文件名")
-    private String smallPlateNcNegativeFileName;
+    private List<String> smallPlateNcNegativeFileName;
     @Schema(description = "大板DXF(排版图)文件名")
-    private String largePlateDxfLayoutFileName;
+    private List<String> largePlateDxfLayoutFileName;
     @Schema(description = "小板DXF(孔槽加工图)文件名")
-    private String smallPlateDxfProcessingFileName;
+    private List<String> smallPlateDxfProcessingFileName;
     @Schema(description = "导出大板NC反(B)面文件")
     private String exportLargePlateNcNegativeFile;
     @Schema(description = "合并大板NC正反(AB)面文件")