From 24071bab7ae1447ea4d3b2c87763275bdab299c7 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期三, 09 四月 2025 11:03:14 +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/ApsPlatePlanTemp.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
index c134035..c8b2695 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
@@ -21,7 +21,7 @@
private String id;
/** 涓昏鍒掑憳 */
- @Excel(name = "涓昏鍒掑憳")
+ @Excel(name = "涓昏鍒�")
private String masterPlanner;
/** 鍛ㄦ棩 */
@@ -163,6 +163,10 @@
/** 鎵规鍙� */
@Excel(name = "鎵规鍙�")
private String batchNumber;
+
+ /** 宸ュ巶 */
+ @Excel(name = "宸ュ巶")
+ private String plant;
public void setId(String id)
{
@@ -563,6 +567,14 @@
.append("hasTurnback", getHasTurnback())
.append("hasRisk", getHasRisk())
.append("batchNumber", getBatchNumber())
+ .append("plant", getPlant())
.toString();
}
+ public String getPlant() {
+ return plant;
+ }
+
+ public void setPlant(String plant) {
+ this.plant = plant;
+ }
}
--
Gitblit v1.9.3