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/CalibrationOrderReport.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java
index 3d9208e..d3f2594 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java
@@ -36,24 +36,24 @@
/**妫�瀹氬伐鍗昳d*/
@Excel(name = "妫�瀹氬伐鍗昳d", width = 15)
@ApiModelProperty(value = "妫�瀹氬伐鍗昳d")
- private String calibrationOrderId;
+ private java.lang.String calibrationOrderId;
/**鎶ュ憡缂栧彿*/
@Excel(name = "鎶ュ憡缂栧彿", width = 15)
@ApiModelProperty(value = "鎶ュ憡缂栧彿")
- private String num;
+ private java.lang.String num;
/**鎶ュ憡绫诲瀷 锛堝瓧鍏竎ommon_upload_type锛�*/
@Excel(name = "鎶ュ憡绫诲瀷 锛堝瓧鍏竎ommon_upload_type锛�", width = 15)
@ApiModelProperty(value = "鎶ュ憡绫诲瀷 锛堝瓧鍏竎ommon_upload_type锛�")
@Dict(dicCode = "瀛楀吀common_upload_type")
- private String type;
+ private java.lang.String type;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private java.lang.String remark;
/**鐘舵�� 0 绂佺敤 1 鍚敤*/
@Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
@ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status;
+ private java.lang.String status;
@ApiModelProperty(value = "鍒ゅ畾缁撴灉锛坧ass锛� 姝ｅ父 锛宖ail锛氬紓甯革級")
@Dict(dicCode = "judgment_result")
@@ -61,5 +61,5 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
}
--
Gitblit v1.9.3