From 616f9896be815a60b5c4063116b7d138892dcfaf Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 14 五月 2024 14:59:25 +0800
Subject: [PATCH] -

---
 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java |   41 +++++++++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index 0865546..9c4a35a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -1,11 +1,14 @@
 package com.jcdm.main.da.paramCollection.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.jcdm.common.annotation.Excel;
 import com.jcdm.common.core.domain.BaseEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * 璁惧浜у搧杩囩▼鍙傛暟閲囬泦瀵硅薄 da_param_collection
@@ -13,6 +16,7 @@
  * @author yyt
  * @date 2023-12-13
  */
+@Data
 public class DaParamCollection extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -69,7 +73,7 @@
     private Date collectionTime;
 
     /** 棰勭暀瀛楁1 */
-    private String spareField1;
+    private String moduleCode;
 
     /** 棰勭暀瀛楁2 */
     private String spareField2;
@@ -96,9 +100,27 @@
     @Excel(name = "绫诲瀷")
     private String type;
 
+    @TableField(exist = false)
     private String model;
-
+    @TableField(exist = false)
     private String productBarcode;
+
+    @TableField(exist = false)
+    private String tightenTheArray;
+
+    @TableField(exist = false)
+    private String productModel;
+
+    @TableField(exist = false)
+    private String yzSfcCode;
+
+    public String getTightenTheArray() {
+        return tightenTheArray;
+    }
+
+    public void setTightenTheArray(String tightenTheArray) {
+        this.tightenTheArray = tightenTheArray;
+    }
 
     public String getProductBarcode() {
         return productBarcode;
@@ -233,16 +255,16 @@
     {
         return collectionTime;
     }
-    public void setSpareField1(String spareField1) 
-    {
-        this.spareField1 = spareField1;
+
+    public String getModuleCode() {
+        return moduleCode;
     }
 
-    public String getSpareField1() 
-    {
-        return spareField1;
+    public void setModuleCode(String moduleCode) {
+        this.moduleCode = moduleCode;
     }
-    public void setSpareField2(String spareField2) 
+
+    public void setSpareField2(String spareField2)
     {
         this.spareField2 = spareField2;
     }
@@ -322,7 +344,6 @@
             .append("paramLower", getParamLower())
             .append("paramStandard", getParamStandard())
             .append("collectionTime", getCollectionTime())
-            .append("spareField1", getSpareField1())
             .append("spareField2", getSpareField2())
             .append("createUser", getCreateUser())
             .append("createTime", getCreateTime())

--
Gitblit v1.9.3