From af96f51d29e2419d413f6171627841b6bb9a76bc Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 22 六月 2026 17:18:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁_泽淇实业

---
 src/main/java/com/ruoyi/sales/vo/CustomerTransactionsDetailsVo.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/vo/CustomerTransactionsDetailsVo.java b/src/main/java/com/ruoyi/sales/vo/CustomerTransactionsDetailsVo.java
index 992860e..96ed799 100644
--- a/src/main/java/com/ruoyi/sales/vo/CustomerTransactionsDetailsVo.java
+++ b/src/main/java/com/ruoyi/sales/vo/CustomerTransactionsDetailsVo.java
@@ -24,10 +24,10 @@
     @Schema(description = "鍚堝悓閲戦")
     private BigDecimal contractAmount;
 
-    @Schema(description = "鏀舵閲戦")
-    private BigDecimal receiptPaymentAmount;
+    @Schema(description = "宸插嚭搴撻噾棰�")
+    private BigDecimal shippedAmount;
 
-    @Schema(description = "搴旀敹閲戦")
-    private BigDecimal receiptableAmount;
+    @Schema(description = "鏈嚭搴撻噾棰�")
+    private BigDecimal unshippedAmount;
 
 }

--
Gitblit v1.9.3