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/CalibrationOrder.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 c1a1b22..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
@@ -80,6 +80,7 @@
*/
@Excel(name = "妫�瀹氱粨鏋�", width = 15)
@ApiModelProperty(value = "妫�瀹氱粨鏋�")
+ @Dict(dicCode = "technology_status")
private String calibrationResult;
/**
* 妫�瀹氱粨鏋滄弿杩�
@@ -188,6 +189,14 @@
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;
/**
* 璁惧鍚嶇О
@@ -247,4 +256,5 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date issueEndDate;
+
}
--
Gitblit v1.9.3