From f57064d2fa563ee4cfeeccd715850ba8b8aa4f60 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 09:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
index fb36111..2e55e79 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
@@ -17,6 +17,9 @@
     @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