From 44ceeeee9cd3f76b0f3a2135421407b73dea9bb0 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 28 八月 2026 11:41:58 +0800
Subject: [PATCH] fix(sales): 修复销售台账发货状态查询逻辑

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

diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 204f688..aa2b3fe 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
 import com.ruoyi.sales.pojo.CommonFile;
 import com.ruoyi.sales.pojo.SalesLedgerProduct;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -15,9 +17,11 @@
 public class SalesLedgerDto {
     private Long id;
     private String salesContractNo;
+    private Integer contractType = 1;
+    private Long parentContractId;
     private String customerContractNo;
     private String projectName;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date entryDate;
 
     private String entryDateStart;
@@ -58,4 +62,7 @@
 
     @Schema(description = "浜よ揣鏃ユ湡")
     private LocalDate deliveryDate;
+
+    private List<StorageBlobDTO> storageBlobDTOs;
+    private List<StorageBlobVO> StorageBlobVOs;
 }

--
Gitblit v1.9.3