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/EquipmentReportRepair.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
index c200ca3..fa7d21e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
@@ -16,6 +16,7 @@
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -148,6 +149,12 @@
@ApiModelProperty(value = "鏉ユ簮Id")
private String sourceId;
+ /**
+ * qsw 2023-12-29
+ */
+ @ApiModelProperty(value = "绫诲瀷锛�1琚姩鎶ヤ慨锛�2涓诲姩鎶ヤ慨锛�3涓诲姩缁翠慨锛�")
+ private String type;
+
/*********************************************** 鎵� 灞� 瀛� 娈� ********************************************************/
/**
* 璁惧缂栧彿
@@ -171,6 +178,13 @@
*/
@TableField(exist = false)
private String equipmentSpecification;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date acceptTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finishTime;
+ private BigDecimal faultHour;
/**
* 闄勪欢涓婁紶鍒楄〃
*/
@@ -184,4 +198,5 @@
private Integer quantity;
@TableField(exist = false)
private String batchNo;
+
}
--
Gitblit v1.9.3