From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/controller/ProductMaterialController.java | 7 +++++--
1 files changed, 5 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..21eddbc 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
@@ -1,5 +1,8 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -45,8 +48,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