From f16ec51787ed0cb094b71ff8146c740d944f729d Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期四, 15 五月 2025 11:40:54 +0800 Subject: [PATCH] Merge branch 'dev_platePlanv2' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java index 5f86243..6986fd7 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java @@ -88,6 +88,19 @@ @Excel(name = "鏃ュ巻鎻忚堪") private String workCalender; + /** 涓撲笟 */ + @Schema(description = "涓撲笟", type = "String") + @Excel(name = "涓撲笟") + private String major; + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } + public void setId(Long id) { this.id = id; @@ -249,6 +262,7 @@ .append("updateTime", getUpdateTime()) .append("modelId", getModelId()) .append("workCalender", getWorkCalender()) + .append("major", getMajor()) .toString(); } } -- Gitblit v1.9.3