From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 7e8967f..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
@@ -9,6 +9,7 @@
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -135,4 +136,28 @@
 
     @ApiModelProperty(value = "是否公示(0.否 1.是)")
     private Integer isPublicity;
+
+    @ApiModelProperty(value = "处理状态(1.待处理 2.已处理)")
+    private Integer handleStatus;
+
+    @ApiModelProperty(value = "发生地址经纬度信息,逗号分割(长的在前面,短的在后面)")
+    private String lngLat;
+
+    @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