From e0c8edd1d949fae5883a60019d02a9c5f7cb7a29 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 09:08:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/ProductBomService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductBomService.java b/src/main/java/com/ruoyi/production/service/ProductBomService.java
index d812f9f..af6979c 100644
--- a/src/main/java/com/ruoyi/production/service/ProductBomService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductBomService.java
@@ -20,11 +20,11 @@
*/
public interface ProductBomService extends IService<ProductBom> {
- IPage<ProductBomDto> listPage(Page page, ProductBomDto productBomDto);
+ IPage<ProductBomDto> listPage(Page<ProductBom> page, ProductBomDto productBomDto);
AjaxResult add(ProductBom productBom);
- AjaxResult uploadBom(MultipartFile file);
+ AjaxResult uploadBom(MultipartFile file, Long dictCode);
void exportBom(HttpServletResponse response, Integer bomId);
}
--
Gitblit v1.9.3