From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 b2f51d8..d895863 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
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
+
import java.time.LocalDateTime;
import com.ycl.platform.base.AbsEntity;
+import enumeration.general.WorkOrderStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -29,6 +30,18 @@
@TableField("work_order_no")
private String workOrderNo;
+ /** 鏁呴殰绫诲瀷 */
+ @TableField("error_type")
+ private String errorType;
+
+ @ApiModelProperty("璁惧缂栧彿")
+ @TableField("serial_number")
+ private String serialNumber;
+
+ @ApiModelProperty("宸ュ崟鏉ユ簮")
+ @TableField("source")
+ private String source;
+
@ApiModelProperty("杩愮淮鍗曚綅")
@TableField("unit_id")
private Integer unitId;
@@ -36,6 +49,10 @@
@ApiModelProperty("杩愮淮浜哄憳")
@TableField("yw_people_id")
private Integer ywPeopleId;
+
+ @ApiModelProperty("鐘舵��")
+ @TableField("status")
+ private WorkOrderStatusEnum status;
@ApiModelProperty("杩愮淮澶勭悊鏃堕棿")
@TableField("yw_handle_time")
@@ -49,9 +66,11 @@
@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;
}
--
Gitblit v1.8.0