From 7f6f725ad67e017c0bbae2a4de01952b88352af0 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 15 三月 2024 10:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 05d7528..f277c2f 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
@@ -2,10 +2,12 @@
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 +15,7 @@
* @author yyt
* @date 2023-12-13
*/
+@Data
public class DaParamCollection extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -96,7 +99,39 @@
@Excel(name = "绫诲瀷")
private String type;
- public void setId(Long id)
+ private String model;
+
+ private String productBarcode;
+
+ private String tightenTheArray;
+
+ private String productModel;
+
+ public String getTightenTheArray() {
+ return tightenTheArray;
+ }
+
+ public void setTightenTheArray(String tightenTheArray) {
+ this.tightenTheArray = tightenTheArray;
+ }
+
+ public String getProductBarcode() {
+ return productBarcode;
+ }
+
+ public void setProductBarcode(String productBarcode) {
+ this.productBarcode = productBarcode;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
--
Gitblit v1.9.3