From a079b14c8a2b9af9deeb7ccf3f91565ebd53f4f8 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 17:36:41 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 fb9b320..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.驳回)")
@@ -35,6 +38,8 @@
private Integer solveStatus;
@ApiModelProperty("接单人id")
private Long solveId;
+ @ApiModelProperty("接单单位id")
+ private Long solveUnitId;
@ApiModelProperty("反馈内容")
private String solveContent;
@ApiModelProperty("反馈图片")
--
Gitblit v1.7.1