From 4697234d287a96db151e6601a861052bd2c6b5b9 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Wed, 21 Jun 2023 13:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=B7=A5=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/modules/business/entity/AppealMediation.java    | 2 +-
 .../business/service/impl/AppealMediationServiceImpl.java       | 2 ++
 .../org/springblade/modules/business/vo/AppealMediationVO.java  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/entity/AppealMediation.java b/src/main/java/org/springblade/modules/business/entity/AppealMediation.java
index 90e3916..787c4b1 100644
--- a/src/main/java/org/springblade/modules/business/entity/AppealMediation.java
+++ b/src/main/java/org/springblade/modules/business/entity/AppealMediation.java
@@ -88,5 +88,5 @@ public class AppealMediation extends BaseEntity {
 	/**
 	 * 调解员姓名
 	 */
-	private Long mediatorName;
+	private String mediatorName;
 }
diff --git a/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
index 56018b9..e54e8b5 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
@@ -167,6 +167,7 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 		vo.setMediationId(mediationId);
 		vo.setVisitors(visitorList);
 		vo.setSkipGrant(appeal.getSkipGrant());
+		vo.setSkipGrantLevel(appeal.getSkipGrantLevel());
 		vo.setPersonNum(visitorList.size());
 		vo.setStreetId(appeal.getStreetId());
 		DictBiz street = DictBizCache.getById(appeal.getStreetId());
@@ -248,6 +249,7 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 			vo.setFinishDeadline(mediation.getFinishDeadline());
 			vo.setRemark(mediation.getRemark());
 			vo.setSubmitTime(mediation.getSubmitTime());
+			vo.setMediatorName(mediation.getMediatorName());
 			vo.setFileList(fileList);
 		}
 		return vo;
diff --git a/src/main/java/org/springblade/modules/business/vo/AppealMediationVO.java b/src/main/java/org/springblade/modules/business/vo/AppealMediationVO.java
index f08a8bb..ae32ec0 100644
--- a/src/main/java/org/springblade/modules/business/vo/AppealMediationVO.java
+++ b/src/main/java/org/springblade/modules/business/vo/AppealMediationVO.java
@@ -198,7 +198,7 @@ public class AppealMediationVO implements Serializable {
 	/**
 	 * 调解员姓名
 	 */
-	private Long mediatorName;
+	private String mediatorName;
 
 	private List<AppealMediationFile> fileList;
 }