From 51ebb09a85d622cae75dc169b4c86723977d3756 Mon Sep 17 00:00:00 2001 From: yangkang <yangkang@xalxzn.com> Date: 星期三, 13 九月 2023 15:39:48 +0800 Subject: [PATCH] 预测维护修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 15 +++++++++++++-- 1 files changed, 13 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..2101d60 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,17 @@ @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; } -- Gitblit v1.9.3