From d9ff3817f056ad245a16bd394133a407d6c6b9cf Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:14:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index a7a7a3b..cb34380 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,8 +1,29 @@
package com.ruoyi.production.dto;
import com.ruoyi.production.pojo.ProductionProductMain;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
public class ProductionProductMainDto extends ProductionProductMain {
+ @ApiModelProperty(value = "宸ュ崟缂栧彿")
+ private String workOrderNo;
+
+ @ApiModelProperty(value = "宸ュ崟鐘舵��")
+ private String workOrderStatus;
+
+ @ApiModelProperty(value = "鎶ュ伐浜哄憳鏄电О")
+ private String nickName;
+
+ @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
+ private BigDecimal quantity;
+
+ @ApiModelProperty(value = "鏄惁鎶ュ伐")
+ private boolean reportWork;
+
+ @ApiModelProperty(value = "鎶ュ伐id")
+ private Long productMainId;
}
--
Gitblit v1.9.3