Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-09 24a64475ee9582f0f09f899b7800a4f7101eaa30

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java

@@ -96,6 +96,15 @@
    /** 类型 */
    @Excel(name = "类型")
    private String type;
    @Excel(name = "参数集编码")
    private String parameterSetCode;
    @Excel(name = "参数集名称")
    private String parameterSetName;
    @Excel(name = "工序编号")
    private String processesCode;
    @Excel(name = "工序名称")
    private String processesName;


    public void setId(Long id) 
    {
@@ -286,6 +295,42 @@
    {
        return type;
    }
    public void setParameterSetCode(String parameterSetCode)
    {
        this.parameterSetCode = parameterSetCode;
    }

    public String getParameterSetCode()
    {
        return parameterSetCode;
    }
    public void setParameterSetName(String parameterSetName)
    {
        this.parameterSetName = parameterSetName;
    }

    public String getParameterSetName()
    {
        return parameterSetName;
    }
    public void setProcessesCode(String processesCode)
    {
        this.processesCode = processesCode;
    }

    public String getProcessesCode()
    {
        return processesCode;
    }
    public void setProcessesName(String processesName)
    {
        this.processesName = processesName;
    }

    public String getProcessesName()
    {
        return processesName;
    }

    @Override
    public String toString() {
@@ -313,6 +358,10 @@
            .append("paramName", getParamName())
            .append("unit", getUnit())
            .append("type", getType())
            .append("parameterSetCode", getParameterSetCode())
            .append("parameterSetName", getParameterSetName())
            .append("processesCode", getProcessesCode())
            .append("processesName", getProcessesName())
            .toString();
    }
}