Merge remote-tracking branch 'origin/master'

懒羊羊

2024-03-22 9988c29bf4682179f8591afc89cc4bdd02313a8e

 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;
    }