From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
index 523e221..f7c0a14 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -1,11 +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 lyq
@@ -17,6 +20,7 @@
public class ComActNeighborCircleAppVO {
@ApiModelProperty("邻里圈id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("邻里圈发布人名字")
@@ -81,10 +85,10 @@
* 是否已经点赞 1 是 2 否
*/
@ApiModelProperty("是否已经点赞 1 是 2 否")
- private Integer haveSign;
+ private Integer haveSign = 2;
/**
- * 发布类型（1.小程序发布 2.后台发布）
+ * 发布类型（1.小程序发布 2.后台发布）
*/
@ApiModelProperty("发布类型（1.小程序发布 2.后台发布）")
private Integer type;
@@ -100,4 +104,47 @@
*/
@ApiModelProperty("社区id")
private Long communityId;
+
+ @ApiModelProperty("话题名称")
+ private String topicName;
+
+ @ApiModelProperty("话题id")
+ private String topicId;
+
+ @ApiModelProperty("热度")
+ private Long hotNum;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+ @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
+ private Integer solveStatus;
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
+ @ApiModelProperty("接单状态 0 否 1是")
+ private Integer orderStatus;
+ @ApiModelProperty("接单人id")
+ private Long solveId;
+ @ApiModelProperty("反馈内容")
+ private String solveContent;
+ @ApiModelProperty("反馈图片")
+ private String solveUrl;
+ @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;
}
--
Gitblit v1.7.1