From 7a31cf800bcc70d598c63863f637cf0a183a940e Mon Sep 17 00:00:00 2001 From: huangjiayang <5265313@qq.com> Date: 星期二, 29 四月 2025 11:45:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java index 2138c12..3f1f122 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java @@ -162,6 +162,42 @@ @Excel(name = "椋庨櫓鏍囪瘑") private Integer hasRisk; + /** 褰撳墠宸ュ簭鐘舵�� */ + @Excel(name = "褰撳墠宸ュ簭鐘舵��") + private String opStatus; + + /** 涓嬩竴宸ュ簭鍚嶇О */ + @Excel(name = "涓嬩竴宸ュ簭鍚嶇О") + private String nextOpName; + + /** 涓嬩竴宸ュ簭鍚嶇О */ + @Excel(name = "褰撳墠宸ュ簭鍚嶇О") + private String stdOp; + + public String getStdOp() { + return stdOp; + } + + public void setStdOp(String stdOp) { + this.stdOp = stdOp; + } + + public String getOpStatus() { + return opStatus; + } + + public void setOpStatus(String opStatus) { + this.opStatus = opStatus; + } + + public String getNextOpName() { + return nextOpName; + } + + public void setNextOpName(String nextOpName) { + this.nextOpName = nextOpName; + } + public String getPlanType() { return planType; } @@ -571,6 +607,8 @@ .append("isStockComplete", getIsStockComplete()) .append("hasTurnback", getHasTurnback()) .append("hasRisk", getHasRisk()) + .append("opStatus", getOpStatus()) + .append("nextOpName", getNextOpName()) .toString(); } } -- Gitblit v1.9.3