From 17d9dd759dea9e7df499325961c5861c96efb213 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 15 五月 2026 15:37:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java |    4 +++-
 1 files changed, 3 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..fb36111 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
@@ -14,7 +14,9 @@
     private Long id;
     @Schema(description = "閿�鍞姤浠峰崟id")
     private Long salesQuotationId;
-
+    @Schema(description = "浜у搧Id")
+    @TableField(value = "product_id")
+    private Long productId;
     @Schema(description = "鍟嗗搧鍚嶇О")
     private String product;
     @Schema(description = "鍟嗗搧瑙勬牸")

--
Gitblit v1.9.3