From a92b97225a0676c3645b72d8945542f7db2e05ae Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 07 五月 2025 11:26:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
index 6440562..c172b1d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
@@ -90,5 +90,14 @@
@Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
private String nextProcessDeparment;
+ /** 褰撳墠宸ュ簭鐘舵�� */
+ @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+ private String opStatus;
+
+ /** 涓嬩竴宸ュ簭鍚嶇О */
+ @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+ private String nextOpName;
+
+
private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>();
}
--
Gitblit v1.9.3