From 673b492bd661ce815ca09f67531d0895f6b4486d Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 09:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

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

diff --git a/src/main/java/com/ruoyi/purchase/vo/SupplierTransactionsDetailsVo.java b/src/main/java/com/ruoyi/purchase/vo/SupplierTransactionsDetailsVo.java
index 3533e6e..845825e 100644
--- a/src/main/java/com/ruoyi/purchase/vo/SupplierTransactionsDetailsVo.java
+++ b/src/main/java/com/ruoyi/purchase/vo/SupplierTransactionsDetailsVo.java
@@ -24,10 +24,10 @@
     @Schema(description = "鍚堝悓閲戦")
     private BigDecimal contractAmount;
 
-    @Schema(description = "浠樻閲戦")
-    private BigDecimal paymentAmount;
+    @Schema(description = "宸插叆搴撻噾棰�")
+    private BigDecimal shippedAmount;
 
-    @Schema(description = "搴斾粯閲戦")
-    private BigDecimal payableAmount;
+    @Schema(description = "鏈叆搴撻噾棰�")
+    private BigDecimal unshippedAmount;
 
 }

--
Gitblit v1.9.3