From 771f9410c470750b8ece732f67cd00259a00957d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 01 三月 2024 16:13:57 +0800
Subject: [PATCH] update

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java |   14 ++++++++++++--
 1 files changed, 12 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..2e63a1e 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
@@ -187,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;
     /**
      * 璁惧鍚嶇О

--
Gitblit v1.9.3