From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +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 |    9 +++++++++
 1 files changed, 9 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 3a72e6c..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
@@ -26,7 +26,16 @@
     @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