From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/entity/HouseEntity.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 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..9782c79 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,49 @@
* 幢编号
*/
@ApiModelProperty(value = "幢编号")
- private Integer buildingNo;
+ private String buildingNo;
/**
* 图片URLS
*/
@ApiModelProperty(value = "图片URLS")
private String imageUrls;
+
+ /**
+ * 经度
+ */
+ private String lng;
+
+ /**
+ * 纬度
+ */
+ private String lat;
+
+ /**
+ * 地址
+ */
+ private String address;
+ /**
+ * 网格id
+ */
+ @ApiModelProperty(value = "网格id")
+ private Integer gridId;
+ /**
+ * 网格编号
+ */
+ @ApiModelProperty(value = "网格编号")
+ private String gridCode;
+
+ /**
+ * 警务网格编号
+ */
+ @ApiModelProperty(value = "警务网格编号")
+ private String jwGridCode;
+
+ /**
+ * 来源 1：地址总表 2：国控采集
+ */
+ @ApiModelProperty(value = "来源 1：地址总表 2：国控采集")
+ private Integer source;
/**
* 创建人
@@ -167,4 +206,10 @@
@ApiModelProperty("是否已删除 0:否 1:是")
private Integer isDeleted;
+ /**
+ * 房产证图片
+ */
+ @ApiModelProperty(value = "房产证图片")
+ private String propertyCertificateImg;
+
}
--
Gitblit v1.9.3