From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 0bd7f2a..33fd914 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
@@ -34,9 +34,9 @@
@TableField("error_type")
private String errorType;
- @ApiModelProperty("鐐逛綅")
- @TableField("point_id")
- private Integer pointId;
+ @ApiModelProperty("璁惧缂栧彿")
+ @TableField("serial_number")
+ private String serialNumber;
@ApiModelProperty("宸ュ崟鏉ユ簮")
@TableField("source")
@@ -66,11 +66,19 @@
@TableField("yw_condition")
private String ywCondition;
+ @ApiModelProperty("杩愮淮妫�娴嬫儏鍐�/涓�寮犲浘")
+ @TableField("yw_check_condition")
+ private String ywCheckCondition;
+
@ApiModelProperty("澶勭悊鏈熼檺")
@TableField("processing_period")
private Integer processingPeriod;
- @ApiModelProperty("鏄惁瓒呮椂锛�0娌℃湁 1瓒呮椂")
+ @ApiModelProperty("鏄惁瓒呮椂锛�0娌℃湁 1璀﹀憡 2瓒呮椂")
@TableField("overtime")
private Integer overtime;
+
+ @ApiModelProperty("鏄惁鎵ｈ繃绉垎")
+ @TableField("deduct")
+ private Boolean deduct;
}
--
Gitblit v1.8.0