From db9d95db6f25f95cbc614525adef7dbdeae6478c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 27 七月 2021 16:58:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 14 +++++++++++++-
1 files changed, 13 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 a52f0ad..07c64ec 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
@@ -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