From 8a28bb397d5743edf1da5930db0d6d0fdd86b35e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/entity/HouseEntity.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
index 90cf163..25986b1 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
@@ -44,7 +44,7 @@
@TableName("jczz_house")
@ApiModel(value = "House对象", description = "房屋")
public class HouseEntity implements Serializable {
-
+ private static final long serialVersionUID = 1L;
/**
* 主键
*/
@@ -92,12 +92,14 @@
* 服务到期
*/
@ApiModelProperty(value = "服务到期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date serviceDue;
/**
* 楼层
*/
@ApiModelProperty(value = "楼层")
- private Integer floor;
+ private String floor;
/**
* 幢
*/
@@ -117,12 +119,17 @@
* 幢编号
*/
@ApiModelProperty(value = "幢编号")
- private Integer buildingNo;
+ private String buildingNo;
/**
* 图片URLS
*/
@ApiModelProperty(value = "图片URLS")
private String imageUrls;
+ /**
+ * 网格id
+ */
+ @ApiModelProperty(value = "网格id")
+ private Integer gridId;
/**
* 创建人
--
Gitblit v1.9.3