From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java
index 4e4dcca..65b7882 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.grid;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+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,12 +15,13 @@
public class ComMngVillageBuildingHouseVO {
@ApiModelProperty("房屋id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("户室号")
private String houseNo;
- @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.空置 4.其他)")
private Integer status;
@ApiModelProperty("在住居民数")
--
Gitblit v1.7.1