From 21cbdad6f59a045910b22bb3bf771e47d56c096f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java
index 6596afd..11e66ac 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -7,11 +8,15 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 澶囦欢璇疯喘鍗�
@@ -32,8 +37,8 @@
* 鍒犻櫎鏍囪
*/
@Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
+ @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 璇疯喘鍗曠紪鐮�
*/
@@ -70,4 +75,18 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ /**
+ * 澶囦欢璇疯喘鏄庣粏鍗�
+ */
+ @TableField(exist = false)
+ private List<Map<String, Object>> sparePartRequisitionDetailList;
+
+ @TableField(exist = false)
+ private List<EamSparePartRequisitionDetail> sparePartRequisitionDetails;
+
+ @TableField(exist = false)
+ private List<EamSparePartRequisitionDetail> removeDetailList;
+
+
}
--
Gitblit v1.9.3