Merge branch 'feature/1008201' into 'master'

1008201【新增】会员包优化一期

See merge request rays/pcloud-book!1679

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java

@@ -1905,6 +1905,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         for (ResourcePageItemVO itemVO : itemVOS) {
             ActivityBaseInfoWithPriceDTO baseInfoDTO = baseInfoDTOMap.get(itemVO.getServeId());
             itemVO.setTypeName("平台会员活动");
+            itemVO.setActivityBaseInfo(baseInfoDTO);
             if (null != baseInfoDTO) {
                 itemVO.setServeName(baseInfoDTO.getTitle());
                 itemVO.setServePic(baseInfoDTO.getSquareImg());

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageItemVO.java

@@ -6,6 +6,7 @@ import com.pcloud.book.applet.entity.AppletThirdResources;
 import com.pcloud.book.book.vo.response.BookQrcodeWxworkResponseVO;
 import com.pcloud.book.group.dto.MultiChannelContentDTO;
 import com.pcloud.book.group.entity.ResourcePageOuterLink;
+import com.pcloud.combinedmarketing.memberActivity.dto.ActivityBaseInfoWithPriceDTO;
 import com.pcloud.common.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -160,4 +161,7 @@ public class ResourcePageItemVO extends BaseDto{
     private Integer folderNum;
 
     private Integer serveNum;
+
+    @ApiModelProperty("会员包信息")
+    private ActivityBaseInfoWithPriceDTO activityBaseInfo;
 }