From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +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