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/EditNeighborCircleAdminVO.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 ae21f45..a3b294b 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
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
+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;
@@ -13,6 +15,7 @@
public class EditNeighborCircleAdminVO {
@ApiModelProperty("邻里圈Id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
@@ -29,18 +32,18 @@
@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("接单单位id")
+ private Long solveUnitId;
@ApiModelProperty("反馈内容")
private String solveContent;
@ApiModelProperty("反馈图片")
private String solveUrl;
- @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
- private Integer dealStatus;
@ApiModelProperty("预计服务时长")
private String targetServiceTime;
@ApiModelProperty("实际服务时长")
--
Gitblit v1.7.1