From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 05bd888..c119e94 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -2,9 +2,11 @@
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.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@@ -48,14 +50,17 @@
private List<CommonFile> SalesLedgerFiles;
private Integer type;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
private LocalDate executionDate;
private Boolean status;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ @Schema(description = "浜よ揣鏃ユ湡")
private LocalDate deliveryDate;
+
+ private List<StorageBlobDTO> storageBlobDTOs;
+ private List<StorageBlobVO> StorageBlobVOs;
}
--
Gitblit v1.9.3