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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 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 ac54742..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
@@ -9,7 +9,9 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -29,6 +31,9 @@
@ApiModelProperty("发起人名字")
private String sponsorName;
+
+ @ApiModelProperty("发布人昵称")
+ private String userNickName;
@ApiModelProperty("发生地址")
@NotBlank(groups = {AddGroup.class},message = "发生地址不能为空")
@@ -79,7 +84,7 @@
private Date examineAt;
@ApiModelProperty("创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("社区id")
@@ -88,12 +93,15 @@
@ApiModelProperty("点赞数量")
private Integer giveThumbsUpNum;
+ @ApiModelProperty("评论数量")
+ private Integer commentNum;
+
@ApiModelProperty("是否匿名发布 0 否 1 是")
@Min(value = 0,groups = {AddGroup.class},message = "是否匿名发布不能为空")
private Integer isHide;
@ApiModelProperty("是否点赞 0 否 1 是")
- private Integer haveGiveThumbsUp;
+ private Integer haveGiveThumbsUp = 0;
@ApiModelProperty(value = "是否需要反馈 1 是 0 不是",example = "0")
private Integer isNeedFeedBack;
@@ -108,6 +116,7 @@
private Long logInUserId;
@ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date feedbackAt;
@ApiModelProperty("发起人手机号")
@@ -115,4 +124,40 @@
@ApiModelProperty("拒绝原因")
private String rejectReason;
+
+ @ApiModelProperty(value = "后台登录人员id",hidden = true)
+ private Long backUserId;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addrRemark;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
+ private Integer isReport;
+
+ @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