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/EamSparePartInventory.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
index 903e43d..dc1f96b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
@@ -1,17 +1,20 @@
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.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @Description: 澶囦欢搴撳瓨淇℃伅
@@ -34,6 +37,14 @@
@Excel(name = "澶囧搧澶囦欢ID", width = 15)
@ApiModelProperty(value = "澶囧搧澶囦欢ID")
private String sparePartId;
+
+ /**
+ * 鏉ユ簮绫诲瀷
+ */
+ @Excel(name = "澶囦欢鏉ユ簮绫诲瀷", width = 15)
+ @ApiModelProperty(value = "澶囦欢鏉ユ簮绫诲瀷")
+ @Dict(dicCode = "spare_part_into_type")
+ private String sparePartIntoType;
/**
* 鎵规鍙�
*/
@@ -68,4 +79,7 @@
@Excel(name = "瀛樻斁浣嶇疆", width = 15)
@ApiModelProperty(value = "瀛樻斁浣嶇疆")
private String location;
+
+ @TableField(exist = false)
+ private List<EamSparePartInventory> eamSparePartInventories;
}
--
Gitblit v1.9.3