From 24a64475ee9582f0f09f899b7800a4f7101eaa30 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 09 一月 2024 14:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
index 7c1d0d5..b4f8c19 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
@@ -56,7 +56,9 @@
/** 宸ュ簭缂栫爜 */
@Excel(name = "宸ュ簭缂栫爜")
- private String processes;
+ private String processesCode;
+ @Excel(name = "宸ュ簭鍚嶇О")
+ private String processesName;
/** 璁惧鐘舵�� */
@Excel(name = "璁惧鐘舵��")
@@ -176,16 +178,22 @@
{
return lineCode;
}
- public void setProcesses(String processes)
+ public void setProcessesCode(String processesCode)
{
- this.processes = processes;
+ this.processesCode = processesCode;
}
- public String getProcesses()
+ public String getProcessesCode()
{
- return processes;
+ return processesCode;
}
- public void setStatus(String status)
+ public void setProcessesName(String processesName) {this.processesName = processesName; }
+
+ public String getProcessesName()
+ {
+ return processesName;
+ }
+ public void setStatus(String status)
{
this.status = status;
}
@@ -262,7 +270,8 @@
.append("equipmentTypeName", getEquipmentTypeName())
.append("workshopCode", getWorkshopCode())
.append("lineCode", getLineCode())
- .append("processes", getProcesses())
+ .append("processesCode", getProcessesCode())
+ .append("processesName", getProcessesName())
.append("status", getStatus())
.append("remark", getRemark())
.append("createUser", getCreateUser())
--
Gitblit v1.9.3