From 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 24 十月 2023 10:52:30 +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 | 5 +++--
1 files changed, 3 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..c1a1b22 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,13 +68,13 @@
*/
@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;
/**
* 妫�瀹氱粨鏋�
*/
@@ -152,6 +152,7 @@
*/
@Excel(name = "澶囩敤瀛楁6", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁6")
+ @Dict(dicCode = "technology_status")
private String calibrationOrderUda6;
/**
* 浼佷笟ID
--
Gitblit v1.9.3