From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java
index c802a91..b4d8a1f 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java
@@ -11,6 +11,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import java.util.List;
+import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -20,9 +22,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
/**
* <p>
@@ -109,8 +108,9 @@
* @return
*/
@ApiOperation("微型设备列表")
- @GetMapping("/list")
- public R<List<MwMicroEquipmentVO>> getList() {
- return R.ok(mwMicroEquipmentService.getList());
+ @GetMapping("/list/{departmentId}")
+ public R<List<MwMicroEquipmentVO>> getList(
+ @ApiParam(name = "departmentId", value = "医院id", required = true) @PathVariable("departmentId") Long departmentId) {
+ return R.ok(mwMicroEquipmentService.getList(departmentId));
}
}
--
Gitblit v1.7.1