From a92b12d5adaa8827c1474d42b73c98e17953ecb5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 08 四月 2026 17:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/basic/service/IProductModelService.java | 5 ++++-
1 files changed, 4 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..149c091 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;
@@ -25,6 +26,8 @@
List<ProductModel> selectModelList(ProductDto productDto);
+ List<ProductModel> selectModelListByProductIds(List<Long> ids);
+
/**
* 鏍规嵁id鏌ヨ浜у搧瑙勬牸鍒嗛〉鏌ヨ
* @param page
@@ -33,5 +36,5 @@
*/
IPage<ProductModel> modelListPage(Page page , ProductDto productDto);
- Boolean importProduct(MultipartFile file);
+ AjaxResult importProductModel(MultipartFile file, Integer productId);
}
--
Gitblit v1.9.3