Merge branch 'dev_ic_diaodong' into develop

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServicePointDTO.java

@@ -12,6 +12,6 @@ import java.io.Serializable;
 @Data
 public class ServicePointDTO implements Serializable {
     private static final long serialVersionUID = -1127819263685687151L;
-    private String serviceId;
+    private String serverId;
     private Integer point;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -1702,7 +1702,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyMap();
         }
-        return list.stream().collect(Collectors.toMap(ServicePointDTO::getServiceId, ServicePointDTO::getPoint));
+        return list.stream().collect(Collectors.toMap(ServicePointDTO::getServerId, ServicePointDTO::getPoint));
     }
 }