From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index c729ea9..4f5a92e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -10,7 +10,9 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@TableName("product_order")
@@ -22,19 +24,7 @@
private Long id;
/**
- * 閿�鍞彴璐d
- */
- @ApiModelProperty(value = "閿�鍞彴璐d")
- private Long salesLedgerId;
-
- /**
- * 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
- */
- @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
- private Long productModelId;
-
- /**
- * 宸ヨ壓璺嚎id
+ * 妯＄増鐨勫伐鑹鸿矾绾縤d
*/
@ApiModelProperty(value = "宸ヨ壓璺嚎id")
private Long routeId;
@@ -45,6 +35,14 @@
@ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
@Excel(name = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
+
+ /**
+ * 璁″垝瀹屾垚鏃堕棿
+ */
+ @ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate planCompleteTime;
/**
* 绉熸埛id
@@ -67,7 +65,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
-
/**
* 闇�姹傛暟閲�
@@ -94,7 +91,4 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
-
-
-
}
--
Gitblit v1.9.3