From dab06e44d031aac4a951cfb01ba9545cc4772fa2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 07 Nov 2023 12:55:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral 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