From 4a8c7756c66e2c5128dc9974ff7d3335deb903e4 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 03 一月 2025 14:18:48 +0800
Subject: [PATCH] merge

---
 medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java
index b1e9e45..b1af872 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java
@@ -87,10 +87,10 @@
     public R<TotalCollectWeightByTypeVO> totalCollectWeightByType(@ApiParam(name = "type", value = "统计类型 1:按周统计 2:按月统计") @PathVariable("type") Integer type) {
         return R.ok(screenService.totalCollectWeightByType(type));
     }
-    /**
-     * 医疗机构收集情况 
-     */
-    @ApiOperation("医疗机构收集情况")
-    @GetMapping("/medicalInstitutionCollectList")
-    public R<List<MedicalInstitutionCollectListVO>>
+//    /**
+//     * 医疗机构收集情况
+//     */
+//    @ApiOperation("医疗机构收集情况")
+//    @GetMapping("/medicalInstitutionCollectList")
+//    public R<List<MedicalInstitutionCollectListVO>>
 }

--
Gitblit v1.7.1