From c82b14f3a882698cbca62ef168615d31711320ca Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 15:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
index a2b06c8..a843e8f 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -24,7 +26,7 @@
@Accessors(chain = true)
@ApiModel(value="eam_equipment_extend瀵硅薄", description="璁惧鍙拌处鎵╁睍琛�")
public class EamEquipmentExtend implements Serializable {
-
+
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
@@ -49,16 +51,44 @@
@Excel(name = "缁翠慨鐘舵��", width = 15)
@ApiModelProperty(value = "缁翠慨鐘舵��")
private String repairStatus;
+ /**鎶�鏈姸鎬�*/
+ @Excel(name = "鎶�鏈姸鎬�", width = 15, orderNum = "4")
+ @ApiModelProperty(value = "鎶�鏈姸鎬�")
+ private String technologyStatus;
/**鏈�鏂颁簩淇濇棩鏈�*/
@ApiModelProperty(value = "鏈�鏂颁簩淇濇棩鏈�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date latestSecondMaintenance;
/**涓嬫浜屼繚鏃ユ湡*/
@ApiModelProperty(value = "涓嬫浜屼繚鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date nextSecondMaintenance;
/**鏈�鏂颁笁淇濇棩鏈�*/
@ApiModelProperty(value = "鏈�鏂颁笁淇濇棩鏈�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date latestThirdMaintenance;
/**涓嬫涓変繚鏃ユ湡*/
@ApiModelProperty(value = "涓嬫涓変繚鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date nextThirdMaintenance;
+ /**涓変繚鍛ㄦ湡(骞�)*/
+ @ApiModelProperty(value = "涓変繚鍛ㄦ湡(骞�)")
+ private Integer thirdMaintenancePeriod;
+ /**鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�*/
+ @ApiModelProperty(value = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date latestTechnologyCheck;
+ /**鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�*/
+ @ApiModelProperty(value = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date nextTechnologyCheck;
+ /**鎶�鏈壌瀹氬懆鏈�(骞�)*/
+ @ApiModelProperty(value = "鎶�鏈壌瀹氬懆鏈�(骞�)")
+ private Integer technologyCheckPeriod;
}
--
Gitblit v1.9.3