From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/controller/ProductMaterialController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
index 82acc3e..2c27907 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
@@ -45,8 +45,8 @@
@GetMapping("/list")
@ApiOperation("鐗╂枡鏁版嵁绫诲埆鏁版嵁闆嗗悎")
@Log(title = "鐗╂枡鏁版嵁绫诲埆鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
- public AjaxResult productMaterialList() {
- List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList();
+ public AjaxResult productMaterialList(@RequestParam("type") Integer type) {
+ List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList(type);
return AjaxResult.success(productMaterialMap);
}
--
Gitblit v1.9.3