From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题

---
 src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java |   48 ++++++++++++++++++++++++++++++------------------
 1 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java b/src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java
index dd93b64..bdb35b0 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java
@@ -52,40 +52,52 @@
 	private String eventTime;
 
 	/**
-	 * 纠纷方1姓名
+	 * 当事人1姓名
 	 */
-	@ApiModelProperty(value = "纠纷方1姓名")
-	@ExcelProperty( "纠纷方1姓名")
+	@ApiModelProperty(value = "当事人1姓名")
+	@ExcelProperty( "当事人1姓名")
 	private String nameOne;
 	/**
-	 * 纠纷方1电话
+	 * 当事人1性别
 	 */
-	@ApiModelProperty(value = "纠纷方1电话")
-	@ExcelProperty( "纠纷方1电话")
+	@ApiModelProperty(value = "当事人1性别")
+	@ExcelProperty( "当事人1性别（男/女）")
+	private String genderOne;
+	/**
+	 * 当事人1电话
+	 */
+	@ApiModelProperty(value = "当事人1电话")
+	@ExcelProperty( "当事人1电话")
 	private String phoneOne;
 	/**
-	 * 纠纷方1身份证号码
+	 * 当事人1身份证号码
 	 */
-	@ApiModelProperty(value = "纠纷方1身份证号码")
-	@ExcelProperty( "纠纷方1身份证号码")
+	@ApiModelProperty(value = "当事人1身份证号码")
+	@ExcelProperty( "当事人1身份证号码")
 	private String idCardOne;
 	/**
-	 * 纠纷方2姓名
+	 * 当事人2姓名
 	 */
-	@ApiModelProperty(value = "纠纷方2姓名")
-	@ExcelProperty( "纠纷方2姓名")
+	@ApiModelProperty(value = "当事人2姓名")
+	@ExcelProperty( "当事人2姓名")
 	private String nameTwo;
 	/**
-	 * 纠纷方2电话
+	 * 当事人2性别
 	 */
-	@ApiModelProperty(value = "纠纷方2电话")
-	@ExcelProperty( "纠纷方2电话")
+	@ApiModelProperty(value = "当事人2性别")
+	@ExcelProperty( "当事人2性别（男/女）")
+	private String genderTwo;
+	/**
+	 * 当事人2电话
+	 */
+	@ApiModelProperty(value = "当事人2电话")
+	@ExcelProperty( "当事人2电话")
 	private String phoneTwo;
 	/**
-	 * 纠纷方2身份证号码
+	 * 当事人2身份证号码
 	 */
-	@ApiModelProperty(value = "纠纷方2身份证号码")
-	@ExcelProperty( "纠纷方2身份证号码")
+	@ApiModelProperty(value = "当事人2身份证号码")
+	@ExcelProperty( "当事人2身份证号码")
 	private String idCardTwo;
 
 	/**

--
Gitblit v1.9.3