From b169b0c298fb294adbc5bd332982908afca4e819 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 16 四月 2024 10:09:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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 0865546..8838423 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;
@@ -96,10 +100,28 @@
@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;
}
--
Gitblit v1.9.3