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/PrecisionInspectionDetail.java | 36 ++++++++++--------------------------
1 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java
index fe90cfb..c413968 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java
@@ -4,12 +4,12 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.entity.JeecgEntity;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -29,13 +29,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_precision_inspection_detail瀵硅薄", description="mom_eam_precision_inspection_detail")
-public class PrecisionInspectionDetail implements Serializable {
+public class PrecisionInspectionDetail extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭id*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭id")
- private String id;
/**绮惧害妫�楠岃〃id*/
@Excel(name = "绮惧害妫�楠岃〃id", width = 15)
@ApiModelProperty(value = "绮惧害妫�楠岃〃id")
@@ -64,22 +60,7 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
+
/**tenantId*/
@Excel(name = "tenantId", width = 15)
@ApiModelProperty(value = "tenantId")
@@ -88,5 +69,8 @@
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
@TableLogic
- private Integer delFlag;
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
+
+ @TableField(exist = false)
+ private String precisionParametersName;
}
--
Gitblit v1.9.3