From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java b/src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java
index f674fd4..da022c2 100644
--- a/src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java
+++ b/src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java
@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.police.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -41,4 +42,27 @@
 	 */
 	private String roleName;
 
+	/**
+	 * 搜索关键字
+	 */
+	private String searchKey;
+
+	/**
+	 * 报警类型名称
+	 */
+	private String alarmTypeName;
+
+	/**
+	 * 开始时间
+	 */
+	private String startTime;
+
+	/**
+	 * 结束时间
+	 */
+	private String endTime;
+
+	@ApiModelProperty(value = "派出所名称", example = "")
+	private String pcsName;
+
 }

--
Gitblit v1.9.3