From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/police/entity/PoliceStationEntity.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/police/entity/PoliceStationEntity.java b/src/main/java/org/springblade/modules/police/entity/PoliceStationEntity.java
index d055f43..d41f523 100644
--- a/src/main/java/org/springblade/modules/police/entity/PoliceStationEntity.java
+++ b/src/main/java/org/springblade/modules/police/entity/PoliceStationEntity.java
@@ -9,6 +9,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
+
+import org.springblade.modules.grid.handle.GeometryTypeHandler;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -32,15 +34,20 @@
 	private Integer id;
 
 	/**
-	 * 派出所编号
+	 * 编号
 	 */
-	@ApiModelProperty(value = "派出所编号")
+	@ApiModelProperty(value = "编号")
 	private String code;
 	/**
-	 * 派出所名称
+	 * 名称
 	 */
-	@ApiModelProperty(value = "派出所名称")
+	@ApiModelProperty(value = "名称")
 	private String name;
+	/**
+	 * 父级编号
+	 */
+	@ApiModelProperty(value = "父级编号")
+	private String parentCode;
 	/*
 	 * 辖区面数据
 	 * @TableField(typeHandler = GeometryTypeHandler.class) 操作面的时候用，平时注释掉
@@ -55,6 +62,12 @@
 	private Integer sort;
 
 	/**
+	 * 层级
+	 */
+	@ApiModelProperty(value = "层级")
+	private Integer level;
+
+	/**
 	 * 创建人
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)

--
Gitblit v1.9.3