From 72a32c227fdf10f34fe563a7de35169da5729eea Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 07 七月 2026 15:50:31 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂
---
src/main/java/com/ruoyi/basic/service/IProductService.java | 5 ++++-
1 files changed, 4 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..ec3ca19 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,7 @@
List<ProductTreeDto> selectProductList(ProductDto productDto);
- IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel);
+ IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, ProductModel productModel);
+
+ IPage<ProductModelVo> listPageProductModelByType(Page<ProductModelVo> page, ProductModel productModel, Long topProductParentId);
}
--
Gitblit v1.9.3