From c924d59a94fc17d570610cbf2b691481dd0b2e4d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 16 一月 2026 17:50:09 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 449b75a..3e171bc 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
public class ProductionProductMainDto extends ProductionProductMain {
@@ -20,6 +21,15 @@
@ApiModelProperty(value = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty(value = "鏄惁鎶ュ伐")
- private boolean reportWork;
+ //浜у搧鍚嶇О
+ private String productName;
+
+ //浜у搧瑙勬牸鍨嬪彿
+ private String productModelName;
+
+ //鍗曚綅
+ private String unit;
+
+ //閿�鍞悎鍚屽彿
+ private String salesContractNo;
}
--
Gitblit v1.9.3