Merge branch 'dev_policy_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_policy_service

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

@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -29,7 +30,7 @@ public class IcServiceFeedbackV2DTO implements Serializable {
     /**
      * 服务ID
      */
-	private String serviceId;
+	private String serviceRecordId;
 
     /**
      * 服务目标

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceFeedbackV2Entity.java

@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 服务记录反馈表
  *
@@ -29,7 +26,7 @@ public class IcServiceFeedbackV2Entity extends BaseEpmetEntity {
     /**
      * 服务ID
      */
-	private String serviceId;
+	private String serviceRecordId;
 
     /**
      * 服务目标