From cf985b57d178fad1e18b46b9b020548a90d3d915 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 11:17:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java
index 1c71e98..9759400 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.property;
+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;
@@ -9,7 +11,8 @@
@Data
@ApiModel
public class ComPropertyRepairVO {
- private Integer id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 报修内容
@@ -111,10 +114,21 @@
* 物业id
*/
@ApiModelProperty(value = "物业id")
- private Integer propertyId;
+ private Long propertyId;
/**
* 反馈人
*/
@ApiModelProperty(value = "反馈人名称")
private String feedback;
+ @ApiModelProperty(value = "小区名称")
+ private String areaName;
+
+ /**
+ * 状态 0 待处理 1待评价 2已结束
+ */
+ public interface status{
+ int dcl=0;
+ int dpj=1;
+ int yjs=2;
+ }
}
--
Gitblit v1.7.1