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

cjl

2023-07-12 08b52ba6e8930958456ed58a1d39805caa7fe014

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

}