From ba957b5a448708294dead72c3c3b6f8932cc3f76 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 七月 2026 14:41:02 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/procurementrecord/bean/vo/ShippingProductVo.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/bean/vo/ShippingProductVo.java b/src/main/java/com/ruoyi/procurementrecord/bean/vo/ShippingProductVo.java
index b2e2626..760d83f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/bean/vo/ShippingProductVo.java
+++ b/src/main/java/com/ruoyi/procurementrecord/bean/vo/ShippingProductVo.java
@@ -11,6 +11,9 @@
     @Schema(description = "鍑哄簱鍗昳d")
     private Long id;
 
+    @Schema(description = "浜у搧瑙勬牸id")
+    private Long productModelId;
+
     @Schema(description = "浜у搧澶х被")
     private String productCategory;
 
@@ -37,4 +40,7 @@
 
     @Schema(description = "鍚◣鍗曚环")
     private BigDecimal taxInclusiveUnitPrice;
+
+    @Schema(description = "寰呭鐞嗛��璐ф暟閲�")
+    private BigDecimal pendingReturnNum;
 }

--
Gitblit v1.9.3