From bdec8b24b78a6f52d21fff2cc8dfab847304dacc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 四月 2025 11:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
index 6b3be7f..06b9397 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -50,19 +49,10 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- @TableLogic
- private Integer delFlag;
/**宸ュ崟ID*/
@Excel(name = "宸ュ崟ID", width = 15)
@ApiModelProperty(value = "宸ュ崟ID")
private String orderId;
- /**鐐规椤笽D*/
- @Excel(name = "鐐规椤笽D", width = 15)
- @ApiModelProperty(value = "鐐规椤笽D")
- private String itemId;
/**鐐规缁撴灉*/
@Excel(name = "鐐规缁撴灉", width = 15)
@ApiModelProperty(value = "鐐规缁撴灉-姝ｅ父-寮傚父")
@@ -72,8 +62,17 @@
@ApiModelProperty(value = "寮傚父鎻忚堪")
private String exceptionDescription;
/**寮傚父鏄惁淇濅慨*/
- @Excel(name = "寮傚父鏄惁淇濅慨", width = 15)
- @ApiModelProperty(value = "寮傚父鏄惁淇濅慨")
- private String whetherWarranty;
+ @Excel(name = "寮傚父鏄惁鎶ヤ慨", width = 15)
+ @ApiModelProperty(value = "寮傚父鏄惁鎶ヤ慨")
+ private String reportFlag;
+ /**淇濆吇椤瑰簭鍙�*/
+ @ApiModelProperty(value = "淇濆吇椤瑰簭鍙�")
+ private Integer itemCode;
+ /**淇濆吇椤�*/
+ @ApiModelProperty(value = "淇濆吇椤�")
+ private String itemName;
+ /**淇濆吇瑕佹眰*/
+ @ApiModelProperty(value = "淇濆吇瑕佹眰")
+ private String itemDemand;
}
--
Gitblit v1.9.3