From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 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