From 96d416d310d323e68d42d1ed417f6cea21852d57 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 13 五月 2026 11:56:39 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
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