From d0a20f29f07dc24c1fc0b27b8572b24a083d8c0d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 08 四月 2026 09:40:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index bd19d51..59adf0e 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -43,6 +43,7 @@
 
     private Boolean hasChildren = false;
     private List<SalesLedgerProduct> productData;
+    private List<SalesLedgerProductDto> productDtoData;
     private List<String> tempFileIds;
     private List<CommonFile> SalesLedgerFiles;
 
@@ -54,4 +55,9 @@
 
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
+
+    @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+    private LocalDate deliveryDate;
+
+    private String placeOfSinging;
 }

--
Gitblit v1.9.3