From 3858c775f565df000a45afd9a0c38c7b6bb39069 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 07 十月 2023 15:07:58 +0800
Subject: [PATCH] 工厂模型 设备ABC修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 06619c1..adf736a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -311,6 +311,19 @@
@Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15,orderNum = "38",format = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date warrantyEnd;
-
-
+ @Dict(dicCode = "property_status")
+ @Excel(width = 15,orderNum = "41",dicCode = "property_status",name = "璧勪骇鐘舵��")
+ private String propertyStatus;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date newStart;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date newEnd;
+ @TableField(exist = false)
+ private String newABCTag;
+ @TableField(exist = false)
+ List<EquipmentSpares> equipmentSparesList;
}
--
Gitblit v1.9.3