From 8a6375edade9f1edc194a0381369fe94e56c13c7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 13 八月 2021 13:16:36 +0800
Subject: [PATCH] Merge branch 'txb'

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