From 877c9a7d2ee34ebf1a1e4c19cd7c1f8560709b0d Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期三, 09 四月 2025 14:11:09 +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/ApsPartPlanTemp.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
index 1a52542..960aab4 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
@@ -21,7 +21,7 @@
private String id;
/** 涓昏鍒掑憳 */
- @Excel(name = "涓昏鍒掑憳")
+ @Excel(name = "涓昏鍒�")
private String masterPlanner;
/** 鍛ㄦ棩 */
@@ -165,6 +165,11 @@
/** 鎵规鍙� */
@Excel(name = "鎵规鍙�")
private String batchNumber;
+
+ /** 宸ュ巶 */
+ @Excel(name = "宸ュ巶")
+ private String plant;
+
public void setId(String id)
{
@@ -565,6 +570,7 @@
.append("hasTurnback", getHasTurnback())
.append("hasRisk", getHasRisk())
.append("batchNumber", getBatchNumber())
+ .append("plant", getPlant())
.toString();
}
@@ -575,4 +581,11 @@
public void setIsSuspendedTxt(String isSuspendedTxt) {
this.isSuspendedTxt = isSuspendedTxt;
}
+ public String getPlant() {
+ return plant;
+ }
+
+ public void setPlant(String plant) {
+ this.plant = plant;
+ }
}
--
Gitblit v1.9.3