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/PrecisionParametersTemplateDetail.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java
index da9c9b9..a62746b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java
@@ -14,6 +14,7 @@
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
+import java.math.BigDecimal;
/**
* @Description: 绮惧害鍙傛暟妯℃澘鏄庣粏
@@ -26,11 +27,10 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_precision_parameters_template_detail瀵硅薄", description="绮惧害鍙傛暟妯℃澘鏄庣粏")
-public class PrecisionParametersTemplateDetail extends JeecgEntity implements Serializable {
+public class PrecisionParametersTemplateDetail implements Serializable {
private static final long serialVersionUID = 1L;
-
-
- /**绮惧害鍙傛暟妯℃澘id*/
+ private String id;
+ /**绮惧害鍙傛暟妯℃澘id*/
@Excel(name = "绮惧害鍙傛暟妯℃澘id", width = 15)
@ApiModelProperty(value = "绮惧害鍙傛暟妯℃澘id")
private String precisionParametersTemplateId;
@@ -43,10 +43,8 @@
@ApiModelProperty(value = "绉熸埛id")
private String tenantId;
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @JsonIgnore
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", hidden = true)
- @TableLogic
+ @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@@ -54,8 +52,8 @@
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "浣嶇疆", width = 15)
+ @ApiModelProperty(value = "浣嶇疆")
private String pptdUda1;
/**澶囩敤瀛楁2*/
@Excel(name = "澶囩敤瀛楁2", width = 15)
@@ -104,4 +102,20 @@
@TableField(exist = false)
private String unit;
+ private Integer sort;
+
+ private String tolerance;
+
+ private Double distance;
+
+ private Double base;
+
+ private Double upper;
+
+ private Double lower;
+
+ private Double actualValue;
+ @TableField(exist = false)
+ private String precisionParametersUda1;
+
}
--
Gitblit v1.9.3