From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期四, 19 八月 2021 17:53:40 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java index e0fb6ca..0c0b975 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java @@ -5,6 +5,7 @@ import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * 用户获得随手拍奖励返回参数 @@ -19,4 +20,13 @@ @ApiModelProperty("随手拍最新活动") private ComActEasyPhotoActivityVO easyPhotoActivityVO; + @ApiModelProperty("正在进行中的弹窗问卷调查") + private ComActQuestnaireAppVO popupQuestnaireVO; + + @ApiModelProperty("banner图位置问卷调查列表") + private List<ComActQuestnaireAppVO> bannerQuestnaireList; + + @ApiModelProperty("应用位置问卷调查列表") + private List<ComActQuestnaireAppVO> applicationQuestnaireList; + } -- Gitblit v1.7.1