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-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java index 2aa1114..ed0efc9 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java @@ -162,6 +162,10 @@ @Excel(name = "椋庨櫓鏍囪瘑") private Integer hasRisk; + /** 浣滀笟锛堝伐搴忓悕绉帮級 */ + @Excel(name = "浣滀笟") + private String stdOp; + /** 宸ュ巶 */ // @Excel(name = "宸ュ巶") private String plant; @@ -516,6 +520,14 @@ return hasRisk; } + public void setStdOp(String stdOp) { + this.stdOp = stdOp; + } + + public String getStdOp() { + return stdOp; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -554,7 +566,8 @@ .append("isStockComplete", getIsStockComplete()) .append("hasTurnback", getHasTurnback()) .append("hasRisk", getHasRisk()) - .append("plant", getPlant()) + .append("plant", getPlant()) + .append("stdOp", getStdOp()) .toString(); } public String getPlant() { -- Gitblit v1.9.3