From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 16 +++++++++++++++-
1 files changed, 15 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 cc2bcf4..c9caf71 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,9 +1,12 @@
package com.ruoyi.sales.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -22,5 +25,16 @@
private String remarks;
private String attachmentMaterials;
private Boolean hasChildren = false;
- private List<SalesLedgerProduct> children;
+ private List<SalesLedgerProduct> productData;
+ private List<String> tempFileIds;
+ private List<CommonFile> SalesLedgerFiles;
+
+ private Integer Type;
+ @ApiModelProperty(value = "绛捐鏃ユ湡")
+ private LocalDate executionDate;
+
+ private Boolean status;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
}
--
Gitblit v1.9.3