From 520a715610bd67a6401e989ada8b1c43a312163b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 11 九月 2026 08:09:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

---
 src/main/java/com/ruoyi/basic/service/IProductService.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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..353cd28 100644
--- a/src/main/java/com/ruoyi/basic/service/IProductService.java
+++ b/src/main/java/com/ruoyi/basic/service/IProductService.java
@@ -7,16 +7,20 @@
 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 jakarta.servlet.http.HttpServletResponse;
 
 import java.util.List;
 
 public interface IProductService extends IService<Product> {
-    
+
     int addOrEditProduct(ProductDto productDto);
 
     int delProductByIds(Long[] ids);
 
     List<ProductTreeDto> selectProductList(ProductDto productDto);
 
-    IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel);
+    IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, ProductModel productModel);
+
+    void exportImportTemplate(HttpServletResponse response);
 }

--
Gitblit v1.9.3