From 58579a382615c0f9bd03b52ae7227a2ca64f43f3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 23 八月 2023 16:43:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
index 6ddf43e..e7a7ce8 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -60,12 +60,9 @@
}
@ApiOperation(value = "鏍囧噯搴�-->鐗╂枡-->渚ц竟鏍忓洓绾у睍寮�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(value = "鍨嬪彿/鍨嬪彿鍚嶇О", name = "specificationName", dataTypeClass = String.class)
- })
@GetMapping("/list")
- public Result<?> getFourLevelInformation(String specificationName) {
- List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation(specificationName);
+ public Result<?> getFourLevelInformation() {
+ List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation();
return Result.success(fourLevelInformation);
}
}
--
Gitblit v1.9.3