From 365b5ad817c9c8a2992d505aa39eccfa2be0460e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 09:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 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..4459d00 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
@@ -48,11 +48,7 @@
 	@TableId(value = "id", type = IdType.ASSIGN_ID)
 	private Long id;
 
-	/**
-	 * 地址编码
-	 */
-	@ApiModelProperty(value = "地址编码")
-	private String addressCode;
+
 	/**
 	 * 地址名称
 	 */
@@ -60,10 +56,17 @@
 	private String addressName;
 
 	/**
-	 * 门牌地址名称
+	 * 地址编码
 	 */
-	@ApiModelProperty(value = "门牌地址名称")
-	private String doorplateAddressName;
+	@ApiModelProperty(value = "地址编码")
+	private String addressCode;
+
+	/**
+	 * 地址编码
+	 */
+	@ApiModelProperty(value = "地址编码")
+	private String doorplateAddressCode;
+
 	/**
 	 * 经度
 	 */
@@ -220,10 +223,10 @@
 	@ApiModelProperty(value = "门牌类型")
 	private String doorplateType;
 	/**
-	 * 门牌类型编码
+	 * 门牌类型编号
 	 */
-	@ApiModelProperty(value = "门牌类型编码")
-	private Integer doorplateTypeCode;
+	@ApiModelProperty(value = "门牌类型编号")
+	private String doorplateTypeCode;
 	/**
 	 * 门牌号
 	 */
@@ -239,6 +242,13 @@
 	 */
 	@ApiModelProperty(value = "二维码路径")
 	private String qrCodePath;
+
+	/**
+	 * 子门牌号
+	 */
+	@ApiModelProperty(value = "子门牌号")
+	private String subDoorPlateNo;
+
 	/**
 	 * 大门名称
 	 */

--
Gitblit v1.9.3