From 41a77633d7be6d40195ce6fcb9a697bbc66e2fb5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 16:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 70c82d8..36a3846 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +13,7 @@
@Data
@TableName("product_order")
-public class ProductOrder implements Serializable {
+public class ProductOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,12 +29,13 @@
/**
* 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
*/
+ @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
private Long saleLedgerProductId;
/**
- * 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
+ * 浜у搧瑙勬牸id
*/
- @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+ @ApiModelProperty(value = "浜у搧瑙勬牸id")
private Long productModelId;
/**
@@ -100,6 +100,20 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ /**
+ * 棰勮鏃ョ▼
+ */
+ private BigDecimal expectedSchedule;
+ /**
+ * 鍒堕�犵彮缁�
+ */
+ private String manufacturingTeam;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batchNo;
}
--
Gitblit v1.9.3