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/ComActNeighborCircleAppVO.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 6715e18..e7f4ae5 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
@@ -113,8 +113,10 @@
@ApiModelProperty("社区名称")
private String communityName;
- @ApiModelProperty("处理状态 0 否 1是")
+ @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
private Integer solveStatus;
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
@ApiModelProperty("接单状态 0 否 1是")
private Integer orderStatus;
@ApiModelProperty("接单人id")
@@ -123,14 +125,23 @@
private String solveContent;
@ApiModelProperty("反馈图片")
private String solveUrl;
- @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
- private Integer dealStatus;
@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