From 70a46cd5e65b1ee16fb4bb4954a01129e6898b6d Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期一, 12 五月 2025 18:29:37 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend 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