From 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 20 一月 2026 14:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into hsxny-new
---
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java | 6 +++++-
1 files changed, 5 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 5bbf31f..4e9195c 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -15,6 +15,10 @@
@Data
public class ReceiptPaymentDto extends ReceiptPayment {
+
+ @ApiModelProperty(value = "true:鏌ヨ瓒呰繃鍗佷簲澶╃殑鏈洖娆捐褰�")
+ private Boolean timeOut;
+
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
@@ -44,7 +48,7 @@
@ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
@Excel(isExport = false)
- private Integer salesLedgerId;
+ private Long salesLedgerId;
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
--
Gitblit v1.9.3