From 379222715511cc4d6efd4abbbb3463f5485f590d Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 11 三月 2025 10:27:30 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
index c21f7be..18136f2 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.pojo.Laboratory;
import com.ruoyi.basic.service.LaboratoryService;
+import com.ruoyi.common.core.domain.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +15,6 @@
* 瀹為獙瀹ょ鐞�(LaboratoryController)琛ㄦ帶鍒跺眰
*/
@Api(tags = "鍦烘墍鎴栬鏂�")
-
@RestController
@RequestMapping("/laboratoryScope")
public class LaboratoryController {
@@ -24,8 +23,8 @@
private LaboratoryService laboratoryService;
@ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
- @PostMapping("/selectItemParameter")
- public Result selectItemParameter(Page page ,Laboratory itemParameter) {
+ @GetMapping("/selectItemParameter")
+ public Result selectItemParameter(Page page , Laboratory itemParameter) {
return Result.success(laboratoryService.selectItemParameter(page, itemParameter));
}
@@ -36,7 +35,7 @@
}
@ApiOperation(value = "鍒犻櫎瀹為獙瀹ゅ弬鏁�")
- @PostMapping("/delParameter")
+ @DeleteMapping("/delParameter")
public Result<?> delParameter(Integer id) {
return Result.success(laboratoryService.delParameter(id));
}
--
Gitblit v1.9.3