From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 8fe1e87..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
@@ -1,10 +1,14 @@
package com.panzhihua.common.model.vos.neighbor;
+import java.util.Date;
+
+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;
-
-import java.util.Date;
/**
* @auther llming
@@ -14,10 +18,11 @@
@ApiModel("邻里圈详情")
public class DetailNeighborCircleAdminVO {
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发布人")
- private Long releaseName;
+ private String releaseName;
@ApiModelProperty("发布人电话")
private String releasePhone;
@@ -50,6 +55,31 @@
private Integer isBoutique;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
+ @ApiModelProperty("话题名称")
+ private String topicName;
+
+ @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