From 9988c29bf4682179f8591afc89cc4bdd02313a8e Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 22 三月 2024 10:01:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java |  123 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 122 insertions(+), 1 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 5e85836..3e0c419 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
@@ -102,7 +102,128 @@
     /** 棰勭暀瀛楁4 */
     private String spareField4;
 
-    public void setId(Long id) 
+    /** 宸ュ簭鍚嶇О */
+    @Excel(name = "宸ュ簭鍚嶇О")
+    private String processesName;
+
+    /** 璁惧 */
+    @Excel(name = "璁惧")
+    private String device;
+
+    /** 椤圭洰 */
+    @Excel(name = "椤圭洰")
+    private String project;
+
+    /** 绮惧害 */
+    @Excel(name = "绮惧害")
+    private Long accuracy;
+
+    /** 鏁扮粍闀垮害 */
+    @Excel(name = "鏁扮粍闀垮害")
+    private Long arrayLength;
+
+    /** 閲囬泦棰戠巼 */
+    @Excel(name = "閲囬泦棰戠巼")
+    private String acquisitionFrequency;
+
+    /** 涓氬姟闇�姹傞儴闂� */
+    @Excel(name = "涓氬姟闇�姹傞儴闂�")
+    private String demandDepartment;
+
+    /** 鏄惁閲囬泦 */
+    @Excel(name = "鏄惁閲囬泦")
+    private String whetherToCollect;
+
+    /** 榛樿鍊� */
+    @Excel(name = "榛樿鍊�")
+    private String defaultValue;
+
+    /** 浜у搧鍨嬪彿 */
+    @Excel(name = "浜у搧鍨嬪彿")
+    private String productModel;
+
+
+    public String getProductModel() {
+        return productModel;
+    }
+
+    public void setProductModel(String productModel) {
+        this.productModel = productModel;
+    }
+
+    public String getProcessesName() {
+        return processesName;
+    }
+
+    public void setProcessesName(String processesName) {
+        this.processesName = processesName;
+    }
+
+    public String getDevice() {
+        return device;
+    }
+
+    public void setDevice(String device) {
+        this.device = device;
+    }
+
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
+
+    public Long getAccuracy() {
+        return accuracy;
+    }
+
+    public void setAccuracy(Long accuracy) {
+        this.accuracy = accuracy;
+    }
+
+    public Long getArrayLength() {
+        return arrayLength;
+    }
+
+    public void setArrayLength(Long arrayLength) {
+        this.arrayLength = arrayLength;
+    }
+
+    public String getAcquisitionFrequency() {
+        return acquisitionFrequency;
+    }
+
+    public void setAcquisitionFrequency(String acquisitionFrequency) {
+        this.acquisitionFrequency = acquisitionFrequency;
+    }
+
+    public String getDemandDepartment() {
+        return demandDepartment;
+    }
+
+    public void setDemandDepartment(String demandDepartment) {
+        this.demandDepartment = demandDepartment;
+    }
+
+    public String getWhetherToCollect() {
+        return whetherToCollect;
+    }
+
+    public void setWhetherToCollect(String whetherToCollect) {
+        this.whetherToCollect = whetherToCollect;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

--
Gitblit v1.9.3