diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java index 61f25c8a5..c42e45454 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java @@ -60,17 +60,17 @@ public class OrderPlatesDetailReqVO { @Schema(description = "是否异形", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean isSpecialShaped; - @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "是否正反面造型", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean isSculpt; @Schema(description = "是否侧面造型") - private boolean isSideSculpt; + private Boolean isSideSculpt; @Schema(description = "是否二维刀路") - private boolean has2DModel; + private Boolean is2v; @Schema(description = "是否侧面二维刀路") - private boolean hasSide2DModel; + private Boolean isSide2v; @Schema(description = "是否排孔", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean isRowHole; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java index 8aefdfda6..91c4c3731 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java @@ -156,18 +156,18 @@ public class PlateRespVO extends PageParam { @ExcelProperty("是否异形") private Boolean isSpecialShaped; - @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("是否造型") + @Schema(description = "是否正反面造型", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否正反面造型") private Boolean isSculpt; @Schema(description = "是否侧面造型") - private boolean isSideSculpt; + private Boolean isSideSculpt; @Schema(description = "是否二维刀路") - private boolean has2DModel; + private Boolean is2v; @Schema(description = "是否侧面二维刀路") - private boolean hasSide2DModel; + private Boolean isSide2v; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对") @ExcelProperty("备注") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml index c17a864c5..861165c3b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml @@ -5,7 +5,7 @@