From 1f615d5c6ac7b116c0bb3f075331197f284b998c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 17 六月 2022 09:21:45 +0800
Subject: [PATCH] Merge branch 'huacheng_shuangzheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
index 4661274..fb9b320 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
@@ -29,17 +29,32 @@
@ApiModelProperty("接单状态 0 否 1是")
private Integer orderStatus;
-
- @ApiModelProperty("处理状态 0 否 1是")
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
+ @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
private Integer solveStatus;
-
@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("说明")
+ private String instruction;
+ @ApiModelProperty("求助党员类型 1全部 2指定")
+ private Integer helpMemberType;
+ @ApiModelProperty("求助指定党员数组")
+ private String helpMemberContent;
+ @ApiModelProperty("求助党组织类型 1全部 2指定")
+ private Integer helpOrgType;
+ @ApiModelProperty("求助指定党组织数组")
+ private String helpOrgContent;
/**
* 使用类型（1.邻里圈 2.问题清单 3.需求清单）
--
Gitblit v1.7.1