From 241408b071cb1b43d9307ae9c75c82bb77b6faa7 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期二, 20 九月 2022 17:10:27 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 ffd385b..7fa8222 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,11 +1,12 @@
package com.panzhihua.common.model.vos.community;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
/**
* 用户获得随手拍奖励返回参数
@@ -26,6 +27,9 @@
@ApiModelProperty("banner图位置问卷调查列表")
private List<ComActQuestnaireAppVO> bannerQuestnaireList;
+ @ApiModelProperty("banner图位置活动列表")
+ private List<ComActActivityVO> bannerActivityList;
+
@ApiModelProperty("应用位置问卷调查列表")
private List<ComActQuestnaireAppVO> applicationQuestnaireList;
@@ -35,4 +39,7 @@
@ApiModelProperty("应用预约/登记列表")
private List<ComActReserveIndexVo> comActReserveIndexApplicationVos;
+ @ApiModelProperty("动态banner")
+ private List<BannerVO> bannerVOS;
+
}
--
Gitblit v1.7.1