From 8e210282102b8808d8e7ea218368f1d41f448eb4 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 19 七月 2024 16:14:07 +0800
Subject: [PATCH] 修改UUID

---
 jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
index 3e0c419..409be93 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
@@ -2,6 +2,7 @@
 
 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;
 
@@ -11,12 +12,15 @@
  * @author ruimin
  * @date 2023-12-25
  */
+@Data
 public class DaCollectionParamConf extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 涓婚敭id */
     private Long id;
+
+    private Integer keyNum;
 
     /** 宸ュ簭缂栧彿 */
     @Excel(name = "宸ュ簭缂栧彿")
@@ -52,7 +56,7 @@
 
     /** 鏁版嵁鎻忚堪 */
     @Excel(name = "鏁版嵁鎻忚堪")
-    private String Descriptives;
+    private String descriptives;
 
     /** 涓婇檺鍊� */
     @Excel(name = "涓婇檺鍊�")
@@ -141,6 +145,8 @@
     /** 浜у搧鍨嬪彿 */
     @Excel(name = "浜у搧鍨嬪彿")
     private String productModel;
+
+    private String itemType;
 
 
     public String getProductModel() {
@@ -304,14 +310,14 @@
     {
         return collectParameterUnit;
     }
-    public void setDescriptives(String Descriptives) 
+    public void setDescriptives(String descriptives)
     {
-        this.Descriptives = Descriptives;
+        this.descriptives = descriptives;
     }
 
     public String getDescriptives() 
     {
-        return Descriptives;
+        return descriptives;
     }
     public void setParamUpper(String paramUpper) 
     {
@@ -443,7 +449,7 @@
             .append("contrastParameterFlag", getContrastParameterFlag())
             .append("collectParameterType", getCollectParameterType())
             .append("collectParameterUnit", getCollectParameterUnit())
-            .append("Descriptives", getDescriptives())
+            .append("descriptives", getDescriptives())
             .append("paramUpper", getParamUpper())
             .append("paramLower", getParamLower())
             .append("paramCentral", getParamCentral())

--
Gitblit v1.9.3