From 55c4143362c7df1ece4523597e26947d35e21bda Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 16:16:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
index e7acb12..8d56648 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.purchase.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import lombok.Data;
@@ -15,9 +16,11 @@
private String salesContractNo;
// 閲囪喘鍚堝悓鍙�
+ @Excel(name = "閲囪喘鍚堝悓鍙�")
private String purchaseContractNumber;
// 渚涘簲鍟嗗悕绉�
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
// 鍙戠エ鍙�
@@ -29,9 +32,24 @@
// 寰呬粯娆鹃噾棰�
private BigDecimal unPaymentAmount;
+ // 浠樻閲戦
+ private BigDecimal paymentAmount;
+
+ // 搴斾粯閲戦
+ private BigDecimal payableAmount;
+
// 绋庣巼
private String taxRate;
// 鐧昏浜�
private String registrant;
+
+ private String searchText;
+
+ // 宸蹭粯娆炬�婚噾棰�
+ private BigDecimal paymentAmountTotal;
+
+ private String paymentDateStart;
+
+ private String paymentDateEnd;
}
--
Gitblit v1.9.3