From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 2bf8054..e25a8b9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -105,8 +105,11 @@
}
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
- @GetMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
+ @PostMapping("/selectStandardProductListByMethodId")
+ public Result selectStandardProductListByMethodId(@RequestBody Map<String,Object> map ) {
+ Integer id =(Integer) map.get("id");
+ String tree = (String)map.get("tree");
+ Integer page = (Integer)map.get("page");
return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
}
--
Gitblit v1.9.3