From 7956163b626c832e6a3516af9612e1a8b8b46900 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 18 Jul 2022 17:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcServiceFeedbackV2DTO.java  | 5 +++--
 .../java/com/epmet/entity/IcServiceFeedbackV2Entity.java     | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceFeedbackV2DTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceFeedbackV2DTO.java
index 6cb0bf7b7a..54e7469c7c 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceFeedbackV2DTO.java
+++ b/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;
 
     /**
      * 服务目标
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceFeedbackV2Entity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceFeedbackV2Entity.java
index 2772d22a27..ea194676e9 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceFeedbackV2Entity.java
+++ b/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;
 
     /**
      * 服务目标