From 09c6af7d0c851b366e1ccd4685351c7dba667763 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 九月 2021 14:17:35 +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/ComActEasyPhotoActivityVO.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
index d6524ca..71ae7e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
@@ -1,12 +1,13 @@
package com.panzhihua.common.model.vos.community;
+import java.math.BigDecimal;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
@Data
@ApiModel("随手拍活动返回参数")
@@ -38,6 +39,9 @@
@ApiModelProperty("普通奖励金额")
private BigDecimal ordinaryReward;
+ @ApiModelProperty("一般奖励金额")
+ private BigDecimal commonlyReward;
+
@ApiModelProperty("活动图片")
private String logo;
--
Gitblit v1.7.1