From b8607f49fb2ec4a4113aeb01455e90ae83781bcc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 27 五月 2026 17:11:24 +0800
Subject: [PATCH] 增加餐补夜补,计算薪资

---
 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