From 5385f7748062cc72c7b1d5c8651630751abe5a41 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 02 Feb 2024 20:05:42 +0800
Subject: [PATCH] 社区警格操作调整

---
 src/main/java/org/springblade/modules/police/entity/PoliceAffairsGridEntity.java |   63 +++++++++++--------------------
 1 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/src/main/java/org/springblade/modules/police/entity/PoliceAffairsGridEntity.java b/src/main/java/org/springblade/modules/police/entity/PoliceAffairsGridEntity.java
index b1e2acd..f4c65f7 100644
--- a/src/main/java/org/springblade/modules/police/entity/PoliceAffairsGridEntity.java
+++ b/src/main/java/org/springblade/modules/police/entity/PoliceAffairsGridEntity.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;
 
 /**
@@ -30,32 +32,22 @@
 	@ApiModelProperty("主键id")
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
+	/**
+	 * 警务网格编号
+	 */
+	@ApiModelProperty(value = "警务网格编号")
+	private String jwGridCode;
+	/**
+	 * 派出所编号
+	 */
+	@ApiModelProperty(value = "派出所编号")
+	private String pcsCode;
+	/**
+	 * 派出所名称
+	 */
+	@ApiModelProperty(value = "派出所名称")
+	private String pcsName;
 
-	/**
-	 * objectId
-	 */
-	@ApiModelProperty(value = "objectId")
-	private Integer objectId;
-	/**
-	 * 警务室代码
-	 */
-	@ApiModelProperty(value = "警务室代码")
-	private String jwsCode;
-	/**
-	 * 民警用户id
-	 */
-	@ApiModelProperty(value = "民警用户id")
-	private Long userId;
-	/**
-	 * 民警姓名
-	 */
-	@ApiModelProperty(value = "民警姓名")
-	private String policeman;
-	/**
-	 * 民警联系方式
-	 */
-	@ApiModelProperty(value = "民警联系方式")
-	private String policemanPhone;
 	/**
 	 * 社区编号
 	 */
@@ -67,27 +59,18 @@
 	@ApiModelProperty(value = "社区名称")
 	private String communityName;
 	/**
-	 * 派出所编号
+	 * 民警用户id
 	 */
-	@ApiModelProperty(value = "派出所编号")
-	private String policeStationCode;
-	/**
-	 * 派出所名称
-	 */
-	@ApiModelProperty(value = "派出所名称")
-	private String policeStationName;
+	@ApiModelProperty(value = "民警用户id")
+	private String policeUserId;
+
 	 /*
-	 * 辖区面数据
+	 * 警务网格面数据
 	 * @TableField(typeHandler = GeometryTypeHandler.class) 操作面的时候用,平时注释掉
 	 */
-	@ApiModelProperty(value = "辖区面数据")
+	@ApiModelProperty(value = "警务网格面数据")
 //	@TableField(typeHandler = GeometryTypeHandler.class)
 	private String geom;
-	/**
-	 * 排序
-	 */
-	@ApiModelProperty(value = "排序")
-	private Integer sort;
 
 	/**
 	 * 创建人

--
Gitblit v1.9.3