From 08001726c8b946ff4e9ac0a74f933197ad3c4fe2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 13 三月 2026 10:25:16 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
index 4d24475..9dfc867 100644
--- a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
@@ -1,10 +1,10 @@
package com.ruoyi.production.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.production.dto.ProductMaterialGroupDto;
import com.ruoyi.production.pojo.ProductMaterial;
import java.util.List;
-import java.util.Map;
/**
* <br>
@@ -21,7 +21,7 @@
void syncProductMaterialJob();
- Map<String, List<ProductMaterial>> ProductMaterialList(String materialName);
+ List<ProductMaterialGroupDto> ProductMaterialList(String materialName);
void addProductMaterial(ProductMaterial productMaterial);
--
Gitblit v1.9.3