From b9ab963139d512287995b7aa00c5608c23ad0b2f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 13 五月 2026 14:05:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/procurementrecord/bean/vo/ShippingProductVo.java |    3 +++
 1 files changed, 3 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..9f87aef 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;
 

--
Gitblit v1.9.3