Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java

@@ -1,11 +1,11 @@
package com.panzhihua.common.model.vos.community;

import java.math.BigDecimal;
import java.util.List;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * 用户获得随手拍奖励返回参数
@@ -26,6 +26,9 @@
    @ApiModelProperty("banner图位置问卷调查列表")
    private List<ComActQuestnaireAppVO> bannerQuestnaireList;

    @ApiModelProperty("banner图位置活动列表")
    private List<ComActActivityVO> bannerActivityList;

    @ApiModelProperty("应用位置问卷调查列表")
    private List<ComActQuestnaireAppVO> applicationQuestnaireList;