From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 05 九月 2024 21:55:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java index c937a0a..870eaf4 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; +import java.util.List; import com.ycl.platform.base.AbsEntity; import enumeration.general.WorkOrderStatusEnum; @@ -34,6 +35,10 @@ @TableField("error_type") private String errorType; + @ApiModelProperty("璁惧缂栧彿") + @TableField("serial_number") + private String serialNumber; + @ApiModelProperty("宸ュ崟鏉ユ簮") @TableField("source") private String source; @@ -62,9 +67,23 @@ @TableField("yw_condition") private String ywCondition; + @ApiModelProperty("杩愮淮妫�娴嬫儏鍐�/涓�寮犲浘") + @TableField("yw_check_result") + private String ywCheckResult; + @ApiModelProperty("澶勭悊鏈熼檺") @TableField("processing_period") private Integer processingPeriod; + @ApiModelProperty("鏄惁瓒呮椂锛�0娌℃湁 1璀﹀憡 2瓒呮椂") + @TableField("overtime") + private Integer overtime; + @ApiModelProperty("鏄惁鎵h繃绉垎") + @TableField("deduct") + private Boolean deduct; + + + @TableField(exist=false) + private List<String> errorTypeList; } -- Gitblit v1.8.0