From f39e7de8be43eda95560f49982b6cd0345e24404 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleDataController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleDataController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleDataController.java
index 15b99a0..d575172 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleDataController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleDataController.java
@@ -60,8 +60,8 @@
*/
@ApiOperation( value = "查询回收数据分析-大屏")
@GetMapping(value = "/recycleLarge")
- public R<Map<String,Long>> recycleLarge(@RequestParam(value = "analysisType",required = false) Integer analysisType) {
- Map<String,Long> map = analysisRecycleDataService.recycleLarge(analysisType);
+ public R<Map<String,Integer>> recycleLarge(@RequestParam(value = "analysisType",required = false) Integer analysisType) {
+ Map<String,Integer> map = analysisRecycleDataService.recycleLarge(analysisType);
return R.ok(map);
}
--
Gitblit v1.7.1