Merge branch 'master-new-activity' into dev

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/popularize/PopularizeVO.java

 package com.xxfc.platform.activity.vo.popularize;
 
 import com.xxfc.platform.activity.entity.ActivityPopularize;
+import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
 import lombok.Data;
 
 import java.util.List;
@@ -9,6 +10,5 @@ import java.util.List;
 public class PopularizeVO extends ActivityPopularize {
     List<ItemVO> items;
     List<UserVO> userVOs;
-    boolean isComplete;
-
+	ActivityPopularizeUser activityPopularizeUser;
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java

@@ -102,6 +102,7 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
                     UserVO userVO = BeanUtil.toBean(userFeign.userDetailById(pr.getMinorUserId()).getData(), UserVO.class);
                     return userVO;
                 }).collect(Collectors.toList()));
+                vo.setActivityPopularizeUser(apu[0]);
             }
 
             //设置任务项