From db397ee4a5096af6648e6315ae546ee5380f0550 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 09:21:47 +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/sales/pojo/SalesQuotationProduct.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
index 3e64d15..2e55e79 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
@@ -14,7 +14,12 @@
     private Long id;
     @Schema(description = "閿�鍞姤浠峰崟id")
     private Long salesQuotationId;
-
+    @Schema(description = "浜у搧Id")
+    @TableField(value = "product_id")
+    private Long productId;
+    @Schema(description = "浜у搧瑙勬牸Id")
+    @TableField(value = "product_model_id")
+    private Long productModelId;
     @Schema(description = "鍟嗗搧鍚嶇О")
     private String product;
     @Schema(description = "鍟嗗搧瑙勬牸")

--
Gitblit v1.9.3