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/PrecisionParameters.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java
index 820df2d..c7e7a63 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java
@@ -15,6 +15,7 @@
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
+import java.math.BigDecimal;
/**
* @Description: 绮惧害鍙傛暟
@@ -52,14 +53,14 @@
/**鍒犻櫎鐘舵��(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;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "鏂瑰悜", width = 15)
+ @ApiModelProperty(value = "鏂瑰悜")
private String precisionParametersUda1;
/**澶囩敤瀛楁2*/
@Excel(name = "澶囩敤瀛楁2", width = 15)
@@ -98,4 +99,5 @@
@TableField(exist = false)
private String precisionParametersId;
+
}
--
Gitblit v1.9.3