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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

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

@@ -1,6 +1,5 @@
package com.moral.api.service;

import java.util.List;
import java.util.Map;
import java.util.Set;

@@ -13,5 +12,5 @@
    Set<Map<String, Object>> getSensorByProfessionsAndOrganizationId(Map<String, Object> params);

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