From 60ebb5f4610ce79742a3781c71f7eda4043b7fac Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 08 一月 2024 20:16:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 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 7077b10..ad11ae4 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
@@ -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();
}
}
--
Gitblit v1.9.3