From 17870eeeca47c08244b244c0acb7fe3f3216621f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 11:20:19 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java | 78 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java
index c7e902e..51616bf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java
@@ -1,11 +1,13 @@
package com.panzhihua.common.model.vos.grid;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
/**
*
@@ -13,76 +15,80 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("社区活动 》随手拍返回参数")
public class ComActEasyPhotoVO {
@ApiModelProperty(value = "自增id")
- private Long id;
+ private Long id;
@ApiModelProperty(value = "发起人id")
- private Long sponsorId;
+ private Long sponsorId;
@ApiModelProperty(value = "发生地址")
- private String happenAddr;
+ private String happenAddr;
@ApiModelProperty(value = "地址备注")
- private String addrRemark;
+ private String addrRemark;
@ApiModelProperty(value = "状态 1待处理 2已处理")
- private Integer status;
+ private Integer handleStatus;
@ApiModelProperty(value = "处理人id")
- private Long handlerId;
+ private Long handlerId;
+
+ @ApiModelProperty(value = "处理人名字")
+ private String handlerName;
@ApiModelProperty(value = "创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createAt;
-
- @ApiModelProperty(value = "审核时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date examineAt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
@ApiModelProperty(value = "详情")
- private String detail;
+ private String detail;
@ApiModelProperty(value = "图片路径列表，逗号分隔")
- private String photoPathList;
+ private String photoPathList;
@ApiModelProperty(value = "处理结果")
- private String handleResult;
+ private String handleResult;
@ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔")
- private String handlePhotoList;
+ private String handlePhotoList;
@ApiModelProperty(value = "社区id")
- private Long communityId;
+ private Long communityId;
@ApiModelProperty(value = "是否匿名发布 0 否 1 是")
- private Integer isHide;
+ private Integer isHide;
- @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要")
- private Integer isNeedFeedBack;
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
- @ApiModelProperty(value = "反馈时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date feedbackAt;
-
- @ApiModelProperty(value = "驳回原因")
- private String rejectReason;
-
- @ApiModelProperty(value = "封面图片")
- private String cover;
+ // @ApiModelProperty(value = "封面图片")
+ // private String cover;
@ApiModelProperty(value = "是否删除 0 否 1 是")
- private Integer delTag;
+ private Integer delTag;
@ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
- private Integer isReport;
+ private Integer isReport;
@ApiModelProperty(value = "是否公示(0.否 1.是)")
- private Integer isPublicity;
+ private Integer isPublicity;
+ @ApiModelProperty(value = "发布人名称")
+ private String nickName;
+
+ @ApiModelProperty(value = "发布人头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
+ private String lngLat;
+
+ @ApiModelProperty(value = "随手拍类型列表")
+ private List<String> easyPhotoList;
}
--
Gitblit v1.7.1