From 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 13:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
index 330ad8f..bf4573d 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
@@ -77,7 +77,10 @@
@Excel(name = "璐﹀缂栫爜")
private String orgCode;
- public void setId(Long id)
+ @Excel(name = "宸ヤ綔涓績")
+ private String workCenter;
+
+ public void setId(Long id)
{
this.id = id;
}
@@ -217,6 +220,14 @@
return orgCode;
}
+ public String getWorkCenter() {
+ return workCenter;
+ }
+
+ public void setWorkCenter(String workCenter) {
+ this.workCenter = workCenter;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -234,6 +245,7 @@
.append("opStatus", getOpStatus())
.append("org", getOrg())
.append("orgCode", getOrgCode())
+ .append("workCenter", getWorkCenter())
.toString();
}
}
--
Gitblit v1.9.3