From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
index f98cc80..c992906 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
@@ -1,15 +1,25 @@
package com.ruoyi.production.dto;
-import com.ruoyi.production.pojo.ProductionProductInput;
-import com.ruoyi.production.pojo.ProductionProductOutput;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-@Data
-public class ProductionProductOutputDto extends ProductionProductOutput {
- @ApiModelProperty(value = "鎶ュ伐鍗曞彿")
- private String productNo;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
- @ApiModelProperty(value = "浜у搧鍨嬪彿")
+@Data
+public class ProductionProductOutputDto {
+ private Long id;
+ private Long productMainId;
+ private Long productionProductMainId;
+ private Long productModelId;
+ private BigDecimal quantity;
+ private BigDecimal scrapQty;
+ private LocalDateTime createTime;
+ private LocalDateTime updateTime;
+ private Long tenantId;
+ private Integer createUser;
+ private Integer updateUser;
+ private Long deptId;
+
+ private String productNo;
private String model;
}
--
Gitblit v1.9.3