From b5d1790bff3f6a67d51fd264faff66755e879b72 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Mon, 13 Dec 2021 15:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=BF=97?=
 =?UTF-8?q?=E6=84=BF=E8=80=85=E5=88=86=E5=B8=83=E5=8F=82=E6=95=B0=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/VolunteerDistributionResultDTO.java    | 2 +-
 .../main/java/com/epmet/service/impl/VolunteerServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java
index c1bb3d866c..94a4d4ac88 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java
@@ -27,7 +27,7 @@ public class VolunteerDistributionResultDTO {
 
     @Data
     public static class Distribution {
-        private Set<String> volunteerTypes;
+        private Set<String> volunteerCategories;
         private String epmetUserId;
         private String icResiUserId;
         private String longitude;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
index f0e2796a98..d259315211 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
@@ -162,7 +162,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
                     ServiceConstant.GOV_ORG_SERVER,
                     EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
 
-            distribution.setVolunteerTypes(volunteerTypes);
+            distribution.setVolunteerCategories(volunteerTypes);
             distribution.setEpmetUserId(userBaseInfo.getUserId());
             distribution.setIcResiUserId(icResiUserInfo.getId());
             Optional.of(building).ifPresent(b -> {