From b9a985fea44086bb07069b1913835bbfaf0ed44a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 二月 2026 12:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/basic/service/IProductModelService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/IProductModelService.java b/src/main/java/com/ruoyi/basic/service/IProductModelService.java
index f254612..dd268d6 100644
--- a/src/main/java/com/ruoyi/basic/service/IProductModelService.java
+++ b/src/main/java/com/ruoyi/basic/service/IProductModelService.java
@@ -6,6 +6,7 @@
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -33,5 +34,5 @@
*/
IPage<ProductModel> modelListPage(Page page , ProductDto productDto);
- Boolean importProduct(MultipartFile file);
+ AjaxResult importProductModel(MultipartFile file, Integer productId);
}
--
Gitblit v1.9.3