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/disputeRecord/excel/ExportDisputeRecordExcel.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java b/src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java
index 227a016..1455a29 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java
@@ -53,6 +53,12 @@
 	@ExcelProperty( "纠纷方1姓名")
 	private String nameOne;
 	/**
+	 * 当事人1性别
+	 */
+	@ApiModelProperty(value = "当事人1性别")
+	@ExcelProperty( "当事人1性别（男/女）")
+	private String genderOne;
+	/**
 	 * 纠纷方1电话
 	 */
 	@ApiModelProperty(value = "纠纷方1电话")
@@ -71,6 +77,12 @@
 	@ExcelProperty( "纠纷方2姓名")
 	private String nameTwo;
 	/**
+	 * 当事人2性别
+	 */
+	@ApiModelProperty(value = "当事人2性别")
+	@ExcelProperty( "当事人2性别（男/女）")
+	private String genderTwo;
+	/**
 	 * 纠纷方2电话
 	 */
 	@ApiModelProperty(value = "纠纷方2电话")

--
Gitblit v1.9.3