From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java
index 302dec0..da98e88 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
+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;
@@ -33,16 +34,19 @@
private String sparePartId;
@ApiModelProperty(value = "閰嶅鏁伴噺")
- private Double matingQuantity;
+ private java.lang.Double matingQuantity;
@ApiModelProperty(value = "棰濆畾瀵垮懡")
- private Double lifeSpan;
+ private java.lang.Double lifeSpan;
@ApiModelProperty(value = "鎺у埗鏇存崲鍛ㄦ湡")
- private Double changeCycle;
+ private java.lang.Double changeCycle;
@ApiModelProperty(value = "鏇存崲鍛ㄦ湡鍗曚綅")
+ @Dict(dictTable = "mom_base_unit",dicCode = "id",dicText = "name")
private String unitId;
+ @TableField(exist = false)
+ private String unitName;
@ApiModelProperty(value = "涓婃鏇存崲鍛ㄦ湡")
private java.util.Date laseChangeTime;
@@ -96,4 +100,13 @@
@ApiModelProperty(value = "绮惧害鍙傛暟鍒嗙被缂栫爜/鍚嶇О")
@TableField(exist = false)
private String equipmentStructureNumName;
+ @TableField(exist = false)
+ private String name;
+ @TableField(exist = false)
+ private String num;
+ @TableField(exist = false)
+ private String model;
+ @TableField(exist = false)
+ private String specification;
+
}
--
Gitblit v1.9.3