From d6578ec702eb4fcff690d71ea3237a885f46b85c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 06 七月 2022 15:37:49 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
index c63ffeb..e008a9a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -3,6 +3,7 @@
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;
@@ -47,9 +48,11 @@
private Integer isBoutique;
@ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("最后回复时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date replyAt;
@ApiModelProperty("邻里圈评论列表")
@@ -79,4 +82,52 @@
@ApiModelProperty("驳回原因")
private String refuseReason;
+ @ApiModelProperty("处理状态 0 否 1是")
+ private Integer solveStatus;
+ @ApiModelProperty("接单状态 0 否 1是")
+ private Integer orderStatus;
+ @ApiModelProperty("接单人id")
+ private Long solveId;
+ @ApiModelProperty("反馈内容")
+ private String solveContent;
+ @ApiModelProperty("反馈图片")
+ private String solveUrl;
+ @ApiModelProperty("接单人名称")
+ private String solveName;
+ @ApiModelProperty("接单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date orderTime;
+ @ApiModelProperty("处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date solveTime;
+
+ private Long topicId;
+
+ private Long releaseId;
+
+ private Integer status;
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
+ @ApiModelProperty("预计服务时长")
+ private String targetServiceTime;
+ @ApiModelProperty("实际服务时长")
+ private String realServiceTime;
+ @ApiModelProperty("评价内容")
+ private String comment;
+ @ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date commentTime;
+ @ApiModelProperty("说明")
+ private String instruction;
+ @ApiModelProperty("求助党员类型 1全部 2指定")
+ private Integer helpMemberType;
+ @ApiModelProperty("求助指定党员数组")
+ private String helpMemberContent;
+ @ApiModelProperty("求助党组织类型 1全部 2指定")
+ private Integer helpOrgType;
+ @ApiModelProperty("求助指定党组织数组")
+ private String helpOrgContent;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
}
--
Gitblit v1.7.1