From a862e80c1ee46a77fc8a2dacf59b0110b3669550 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 22 四月 2024 16:32:02 +0800
Subject: [PATCH] 参数修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
index 2636073..aa55d51 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
@@ -68,18 +68,19 @@
*/
@Excel(name = "妫�瀹氭椂闂�", width = 15)
@ApiModelProperty(value = "妫�瀹氭椂闂�")
- private Date calibrationTime;
+ private java.util.Date calibrationTime;
/**
* 涓嬪彂鏃堕棿
*/
@Excel(name = "涓嬪彂鏃堕棿", width = 15)
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
- private Date issueTime;
+ private java.util.Date issueTime;
/**
* 妫�瀹氱粨鏋�
*/
@Excel(name = "妫�瀹氱粨鏋�", width = 15)
@ApiModelProperty(value = "妫�瀹氱粨鏋�")
+ @Dict(dicCode = "technology_status")
private String calibrationResult;
/**
* 妫�瀹氱粨鏋滄弿杩�
@@ -152,6 +153,7 @@
*/
@Excel(name = "澶囩敤瀛楁6", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁6")
+ @Dict(dicCode = "technology_status")
private String calibrationOrderUda6;
/**
* 浼佷笟ID
@@ -185,6 +187,14 @@
@TableField(exist = false)
private String equipmentSpecification;
+
+ @TableField(exist = false)
+ private String useDepartName;
+ /**
+ * ABC鏍囪瘑
+ */
+ @TableField(exist = false)
+ private String equipmentImportance;
@TableField(exist = false)
private List<Map<String, Object>> precisionParameterList;
@@ -246,4 +256,5 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date issueEndDate;
+
}
--
Gitblit v1.9.3