From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
index 8cb4d91..025ae73 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -7,9 +7,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-
+import org.apache.commons.lang3.tuple.Pair;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.util.List;
/**
* @author :yys
@@ -18,7 +19,7 @@
@Data
@ApiModel
@ExcelIgnoreUnannotated
-public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto{
+public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto {
/**
* 鐢熶骇浜篿d
@@ -82,11 +83,17 @@
private String outputRate;
+ private Long totalWorkMinutes;
+
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate entryDate;
private String dateType;
+ private String deviceWorkInfo;
+
+ private List<Pair<String,Integer>> deviceWorkInfoPairList;
+
}
--
Gitblit v1.9.3