From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_玮苓乐器

---
 src/main/java/com/ruoyi/basic/service/IProductService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/IProductService.java b/src/main/java/com/ruoyi/basic/service/IProductService.java
index 7fba662..1abaad4 100644
--- a/src/main/java/com/ruoyi/basic/service/IProductService.java
+++ b/src/main/java/com/ruoyi/basic/service/IProductService.java
@@ -7,6 +7,7 @@
 import com.ruoyi.basic.dto.ProductTreeDto;
 import com.ruoyi.basic.pojo.Product;
 import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.basic.vo.ProductModelVo;
 
 import java.util.List;
 
@@ -18,5 +19,5 @@
 
     List<ProductTreeDto> selectProductList(ProductDto productDto);
 
-    IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel);
+    IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, ProductModel productModel);
 }

--
Gitblit v1.9.3