From 03ffc2598a261d1dc19e77b559268bb84032a389 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 21 四月 2026 08:51:45 +0800
Subject: [PATCH] feat(approve): 新增销售审批功能并优化审批流程

---
 src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 927442b..8a6528d 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -14,10 +14,18 @@
 
 @Data
 public class ReceiptPaymentDto extends ReceiptPayment {
+    @ApiModelProperty(value = "true:鏌ヨ瓒呰繃鍗佷簲澶╃殑鏈洖娆捐褰�")
+    private Boolean timeOut;
+
 
     @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
     @Excel(name = "瀹㈡埛鍚堝悓鍙�")
     private String customerContractNo;
+
+    @ApiModelProperty(value = "鐘舵��")
+    @Excel(name = "鐘舵��")
+    private String statusName;
+
 
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
     @Excel(name = "瀹㈡埛鍚嶇О")
@@ -29,12 +37,17 @@
     @ApiModelProperty(value = "寮�绁ㄦ棩鏈�")
     private Date invoiceDate;
 
+    @TableField(exist = false)
+    private String invoiceDateStart;
+    @TableField(exist = false)
+    private String invoiceDateEnd;
+
     @ApiModelProperty(value = "鏌ヨ鏂囨湰")
     private String searchText;
 
     @ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
     @Excel(isExport = false)
-    private Integer salesLedgerId;
+    private Long salesLedgerId;
 
     @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
     @Excel(name = "閿�鍞悎鍚屽彿")

--
Gitblit v1.9.3