From 6221c8b5df5eb0ee62dce79048c9c3f0dc3d0fc1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 20:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 33fd914..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;
@@ -67,8 +68,8 @@
private String ywCondition;
@ApiModelProperty("杩愮淮妫�娴嬫儏鍐�/涓�寮犲浘")
- @TableField("yw_check_condition")
- private String ywCheckCondition;
+ @TableField("yw_check_result")
+ private String ywCheckResult;
@ApiModelProperty("澶勭悊鏈熼檺")
@TableField("processing_period")
@@ -81,4 +82,8 @@
@ApiModelProperty("鏄惁鎵ｈ繃绉垎")
@TableField("deduct")
private Boolean deduct;
+
+
+ @TableField(exist=false)
+ private List<String> errorTypeList;
}
--
Gitblit v1.8.0