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/EamSparePartReceiveDetail.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceiveDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceiveDetail.java
index 0d6bf30..a14aae6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceiveDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceiveDetail.java
@@ -1,11 +1,13 @@
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;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -31,8 +33,8 @@
* 鍒犻櫎鏍囪
*/
@Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
+ @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 澶囦欢ID
*/
@@ -51,4 +53,23 @@
@Excel(name = "棰嗙敤绫诲瀷;棰嗙敤/褰掕繕", width = 15)
@ApiModelProperty(value = "棰嗙敤绫诲瀷;棰嗙敤/褰掕繕")
private String receiveType;
+
+ /**
+ * 棰嗙敤鍗昳d
+ */
+ @Excel(name = "棰嗙敤鍗昳d", width = 15)
+ @ApiModelProperty(value = "棰嗙敤鍗昳d")
+ private String sparePartReceiveId;
+
+ @TableField(exist = false)
+ private String partCode;
+
+ @TableField(exist = false)
+ private String partName;
+
+ @TableField(exist = false)
+ private String partModel;
+
+ @TableField(exist = false)
+ private String partSpecification;
}
--
Gitblit v1.9.3