From 5513e69c82a82eb6be786d5cb8e23b81bffc8636 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 10 八月 2021 09:55:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
index 05e654f..6d28df8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -101,7 +101,7 @@
private Integer isHide;
@ApiModelProperty("是否点赞 0 否 1 是")
- private Integer haveGiveThumbsUp;
+ private Integer haveGiveThumbsUp = 0;
@ApiModelProperty(value = "是否需要反馈 1 是 0 不是",example = "0")
private Integer isNeedFeedBack;
@@ -149,6 +149,9 @@
@ApiModelProperty(value = "参加活动奖励金额")
private BigDecimal activityAmount;
+ @ApiModelProperty(value = "活动奖励金额")
+ private BigDecimal activityMoney;
+
@ApiModelProperty(value = "随手拍活动id")
private Long activityId;
--
Gitblit v1.7.1