From c3ef548aa36678645b3860c0cf9a0283a97efb92 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期六, 14 九月 2024 15:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
index a98a9e2..fcf0b62 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
@@ -6,13 +6,11 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
-import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import java.util.Date;
-import java.util.List;
/**
* 缁勮鐢熶骇浠诲姟璁″垝
@@ -38,6 +36,15 @@
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@NotNull(message = "浜у搧瀹炰綋缂栧彿涓嶈兘涓虹┖")
public Long proId;
+
+ /**
+ * 浜у搧瀹炰綋缂栧彿
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long orderId;
+
+ @TableField(exist = false)
+ public String orderName;
/**
* 鎵规瀹炰綋缂栧彿
@@ -74,6 +81,15 @@
public Integer status;
/**
+ * 鎶曞叆鐢熶骇鏁伴噺
+ */
+ public Integer inputNumber;
+ /**
+ * 浜у嚭鏁伴噺
+ */
+ public Integer outputNumber;
+
+ /**
* 鍒涘缓浜�
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
--
Gitblit v1.8.0