From d40c3ccad0e5264fefd33264254564dead8c80df Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 06 十一月 2023 11:44:36 +0800 Subject: [PATCH] 单据名称增加单据来源 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java | 6 ++++-- 1 files changed, 4 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..34f8b3a 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 -- Gitblit v1.9.3