From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb

---
 screen-api/src/main/java/com/moral/api/service/RegionService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/RegionService.java b/screen-api/src/main/java/com/moral/api/service/RegionService.java
index cb82fcb..b2ee965 100644
--- a/screen-api/src/main/java/com/moral/api/service/RegionService.java
+++ b/screen-api/src/main/java/com/moral/api/service/RegionService.java
@@ -13,6 +13,6 @@
     Set<Map<String, Object>> getSensorByRegionCodesAndOrganizationId(Map<String, Object> params);
 
     //���������������
-    List<Map<String, Object>> regionContribution(Map<String, Object> params);
+    Map<String, Object> regionContribution(Map<String, Object> params);
 
 }

--
Gitblit v1.8.0