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

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

 screen-api/src/main/java/com/moral/api/service/ProfessionService.java

@@ -10,4 +10,7 @@

    //根据组织和行业获取传感器列表
    Set<Map<String, Object>> getSensorByProfessionsAndOrganizationId(Map<String, Object> params);

    //行业贡献率
    Map<String, Object> professionContribution(Map<String, Object> params);
}