From 271f4a25576ac6c2c8f2c4eb4c9782d6eef85124 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 13:13:55 +0800
Subject: [PATCH] 修改报错
---
src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
index c93e934..8f15d3b 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
@@ -1,11 +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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
import java.util.List;
@Data
@@ -13,33 +16,42 @@
private List<FileVo> fileList;
- @ApiModelProperty(value = "鏌ヨ鏂囨湰")
+ @Schema(description = "鏌ヨ鏂囨湰")
private String searchText;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛ID")
+ private Integer customerId;
+
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @ApiModelProperty(value = "涓氬姟鍛�")
+ @Schema(description = "涓氬姟鍛�")
private String salesman;
- @ApiModelProperty(value = "鍙戠エ鏂囦欢鍚�")
+ @Schema(description = "鍙戠エ鏂囦欢鍚�")
private String invoiceFileName;
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
private BigDecimal receiptPaymentAmount;
- @ApiModelProperty(value = "鏈洖娆鹃噾棰�")
+ @Schema(description = "鍥炴鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date receiptPaymentDate;
+
+ @Schema(description = "鏈洖娆鹃噾棰�")
private BigDecimal unReceiptPaymentAmount;
- @ApiModelProperty(value = "绋庣巼")
+ @Schema(description = "绋庣巼")
private BigDecimal taxRate;
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty(value = "閿�鍞悎鍚孖D")
+ @Schema(description = "閿�鍞悎鍚孖D")
private Integer salesLedgerId;
+
+ private String paymentMethod;
}
--
Gitblit v1.9.3