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/controller/RegionController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/RegionController.java b/screen-api/src/main/java/com/moral/api/controller/RegionController.java
index a88db8f..a05ce80 100644
--- a/screen-api/src/main/java/com/moral/api/controller/RegionController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/RegionController.java
@@ -79,7 +79,7 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<Map<String, Object>> response = regionService.regionContribution(params);
+ Map<String, Object> response = regionService.regionContribution(params);
return ResultMessage.ok(response);
}
}
--
Gitblit v1.8.0