From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java | 1 +
1 files changed, 1 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..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
@@ -80,6 +80,7 @@
*/
@Excel(name = "妫�瀹氱粨鏋�", width = 15)
@ApiModelProperty(value = "妫�瀹氱粨鏋�")
+ @Dict(dicCode = "technology_status")
private String calibrationResult;
/**
* 妫�瀹氱粨鏋滄弿杩�
--
Gitblit v1.9.3