From f45f999d6d366cf1f0b4f0b1a3364d4568a5a406 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 13 三月 2026 12:01:20 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/ProductMaterialService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
index 14098c6..75a32cc 100644
--- a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
@@ -21,7 +21,7 @@
void syncProductMaterialJob();
- List<ProductMaterialGroupDto> ProductMaterialList();
+ List<ProductMaterialGroupDto> ProductMaterialList(Integer type);
void addProductMaterial(ProductMaterial productMaterial);
--
Gitblit v1.9.3