From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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..430102c 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
@@ -31,18 +31,17 @@
private String addrRemark;
@ApiModelProperty(value = "状态 1待处理 2已处理")
- private Integer status;
+ private Integer handleStatus;
@ApiModelProperty(value = "处理人id")
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;
@ApiModelProperty(value = "详情")
private String detail;
@@ -62,18 +61,12 @@
@ApiModelProperty(value = "是否匿名发布 0 否 1 是")
private Integer isHide;
- @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要")
- private Integer isNeedFeedBack;
-
- @ApiModelProperty(value = "反馈时间")
+ @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;
@@ -84,5 +77,16 @@
@ApiModelProperty(value = "是否公示(0.否 1.是)")
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