From 29952e1e673e87d4ac1fc8f7c2d6088c975fa99f Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 28 十一月 2022 11:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
index 555f5de..b0b5968 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +18,7 @@
@ApiModel("邻里圈详情")
public class DetailNeighborCircleAdminVO {
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发布人")
@@ -61,4 +64,22 @@
@ApiModelProperty("头像")
private String imageUrl;
+ @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;
}
--
Gitblit v1.7.1