From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java | 9 ++++++---
1 files changed, 6 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..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,11 +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;
-import java.util.List;
/**
* 用户获得随手拍奖励返回参数
@@ -26,6 +26,9 @@
@ApiModelProperty("banner图位置问卷调查列表")
private List<ComActQuestnaireAppVO> bannerQuestnaireList;
+ @ApiModelProperty("banner图位置活动列表")
+ private List<ComActActivityVO> bannerActivityList;
+
@ApiModelProperty("应用位置问卷调查列表")
private List<ComActQuestnaireAppVO> applicationQuestnaireList;
--
Gitblit v1.7.1