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

cjl

2023-10-20 a3eaa78c6d839b640c728f4c7d8eb27732627b07

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

}