From d7a8baeff8b0e68c54a959e5f46f639c54aad1d1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 17:15:29 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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..21e8dce 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
@@ -1,10 +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;
/**
* 用户获得随手拍奖励返回参数
@@ -19,4 +20,22 @@
@ApiModelProperty("随手拍最新活动")
private ComActEasyPhotoActivityVO easyPhotoActivityVO;
+ @ApiModelProperty("正在进行中的弹窗问卷调查")
+ private ComActQuestnaireAppVO popupQuestnaireVO;
+
+ @ApiModelProperty("banner图位置问卷调查列表")
+ private List<ComActQuestnaireAppVO> bannerQuestnaireList;
+
+ @ApiModelProperty("banner图位置活动列表")
+ private List<ComActActivityVO> bannerActivityList;
+
+ @ApiModelProperty("应用位置问卷调查列表")
+ private List<ComActQuestnaireAppVO> applicationQuestnaireList;
+
+ @ApiModelProperty("banner预约/登记列表")
+ private List<ComActReserveIndexVo> comActReserveIndexBannerVos;
+
+ @ApiModelProperty("应用预约/登记列表")
+ private List<ComActReserveIndexVo> comActReserveIndexApplicationVos;
+
}
--
Gitblit v1.7.1