From 43a8301f04a6ea7891ef16861734163b2646e07f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
index 247085c..c638ebb 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
@@ -1,9 +1,14 @@
package com.ruoyi.sales.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.vo.FileVo;
import com.ruoyi.sales.pojo.InvoiceLedger;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
import java.util.List;
@Data
@@ -17,9 +22,36 @@
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
private String customerName;
+ @ApiModelProperty(value = "瀹㈡埛ID")
+ private Integer customerId;
+
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
@ApiModelProperty(value = "涓氬姟鍛�")
private String salesman;
+
+ @ApiModelProperty(value = "鍙戠エ鏂囦欢鍚�")
+ private String invoiceFileName;
+
+ @ApiModelProperty(value = "鍥炴閲戦")
+ private BigDecimal receiptPaymentAmount;
+
+ @ApiModelProperty(value = "鍥炴鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date receiptPaymentDate;
+
+ @ApiModelProperty(value = "鏈洖娆鹃噾棰�")
+ private BigDecimal unReceiptPaymentAmount;
+
+ @ApiModelProperty(value = "绋庣巼")
+ private BigDecimal taxRate;
+
+ @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @ApiModelProperty(value = "閿�鍞悎鍚孖D")
+ private Integer salesLedgerId;
+
+ private String paymentMethod;
}
--
Gitblit v1.9.3