From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
index 6801b96..83a1157 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
@@ -17,6 +17,7 @@
 package org.springblade.modules.doorplateAddress.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -48,11 +49,7 @@
 	@TableId(value = "id", type = IdType.ASSIGN_ID)
 	private Long id;
 
-	/**
-	 * 地址编码
-	 */
-	@ApiModelProperty(value = "地址编码")
-	private String addressCode;
+
 	/**
 	 * 地址名称
 	 */
@@ -60,10 +57,11 @@
 	private String addressName;
 
 	/**
-	 * 门牌地址名称
+	 * 门牌地址编码
 	 */
-	@ApiModelProperty(value = "门牌地址名称")
-	private String doorplateAddressName;
+	@ApiModelProperty(value = "门牌地址编码")
+	private String addressCode;
+
 	/**
 	 * 经度
 	 */
@@ -74,6 +72,19 @@
 	 */
 	@ApiModelProperty(value = "纬度")
 	private String Y;
+
+	/**
+	 * x84经度
+	 */
+	@ApiModelProperty(value = "x84经度")
+	@TableField("x_84")
+	private String x84;
+	/**
+	 * y84纬度
+	 */
+	@ApiModelProperty(value = "y84纬度")
+	@TableField("y_84")
+	private String y84;
 	/**
 	 * 行政区编码
 	 */
@@ -220,15 +231,15 @@
 	@ApiModelProperty(value = "门牌类型")
 	private String doorplateType;
 	/**
-	 * 门牌类型编码
+	 * 门牌类型编号
 	 */
-	@ApiModelProperty(value = "门牌类型编码")
-	private Integer doorplateTypeCode;
+	@ApiModelProperty(value = "门牌类型编号")
+	private String doorplateTypeCode;
 	/**
 	 * 门牌号
 	 */
 	@ApiModelProperty(value = "门牌号")
-	private Integer doorplateNum;
+	private String doorplateNum;
 	/**
 	 * 门牌名称
 	 */
@@ -239,6 +250,13 @@
 	 */
 	@ApiModelProperty(value = "二维码路径")
 	private String qrCodePath;
+
+	/**
+	 * 子门牌号
+	 */
+	@ApiModelProperty(value = "子门牌号")
+	private String subDoorPlateNo;
+
 	/**
 	 * 大门名称
 	 */

--
Gitblit v1.9.3