From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 12 二月 2025 14:15:40 +0800 Subject: [PATCH] 解决冲突 --- medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java index 9a178a8..c730c06 100644 --- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java +++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; +import java.util.List; /** * <p> @@ -126,4 +127,14 @@ return R.ok(mwProtectionEquipmentService.recordPage(query)); } + /** + * 防护器具列表 + * + * @return + */ + @ApiOperation("防护器具列表") + @GetMapping("/list") + public R<List<MwProtectionEquipmentVO>> queryList() { + return R.ok(mwProtectionEquipmentService.queryList()); + } } -- Gitblit v1.7.1