Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 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);
    }
}