From bb078cde6d9641ec84ee3c52b544153845795c0e Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 13 七月 2026 21:00:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_山西长治
---
src/main/java/com/ruoyi/sales/vo/CustomerTransactionsVo.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/vo/CustomerTransactionsVo.java b/src/main/java/com/ruoyi/sales/vo/CustomerTransactionsVo.java
index 7b8fc1a..a6c7d7f 100644
--- a/src/main/java/com/ruoyi/sales/vo/CustomerTransactionsVo.java
+++ b/src/main/java/com/ruoyi/sales/vo/CustomerTransactionsVo.java
@@ -24,7 +24,10 @@
private BigDecimal receiptPaymentAmount;
@Schema(description = "搴旀敹閲戦")
- //璇ュ鎴烽攢鍞簲鏀剁疮璁￠噾棰�=璐㈠姟(鍑哄簱-閫�璐�)
+ //璇ュ鎴烽攢鍞簲鏀剁疮璁￠噾棰�=鍒濆閲戦-鍥炴-閫�娆�
private BigDecimal receiptableAmount;
+ @Schema(description = "閫�璐ч噾棰�")
+ private BigDecimal returnAmount;
+
}
--
Gitblit v1.9.3