From 2e6ae80c0271e5e45faa399ce94cd44678cce43f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 13 八月 2021 22:58:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 a52f0ad..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;
@@ -143,9 +143,21 @@
@ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
private String lngLat;
- @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通）")
+ @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般）")
private Integer activityType;
@ApiModelProperty(value = "参加活动奖励金额")
private BigDecimal activityAmount;
+
+ @ApiModelProperty(value = "活动奖励金额")
+ private BigDecimal activityMoney;
+
+ @ApiModelProperty(value = "随手拍活动id")
+ private Long activityId;
+
+ @ApiModelProperty(value = "类型（1.心情类 2.治理类）")
+ private Integer easyType;
+
+ @ApiModelProperty(value = "随手拍活动")
+ private ComActEasyPhotoActivityVO easyPhotoActivityVO;
}
--
Gitblit v1.7.1