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/entity/DisputeRecordEntity.java |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java b/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java
index 682b41c..cef0656 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java
@@ -48,34 +48,44 @@
 	@TableField(value = "event_time")
 	private Date eventTime;
 	/**
-	 * 纠纷方1姓名
+	 * 当事人1姓名
 	 */
-	@ApiModelProperty(value = "纠纷方1姓名")
+	@ApiModelProperty(value = "当事人1姓名")
 	private String nameOne;
 	/**
-	 * 纠纷方1电话
+	 * 当事人1性别
 	 */
-	@ApiModelProperty(value = "纠纷方1电话")
+	@ApiModelProperty(value = "当事人1性别")
+	private Integer genderOne;
+	/**
+	 * 当事人1电话
+	 */
+	@ApiModelProperty(value = "当事人1电话")
 	private String phoneOne;
 	/**
-	 * 纠纷方1身份证号码
+	 * 当事人1身份证号码
 	 */
-	@ApiModelProperty(value = "纠纷方1身份证号码")
+	@ApiModelProperty(value = "当事人1身份证号码")
 	private String idCardOne;
 	/**
-	 * 纠纷方2姓名
+	 * 当事人2姓名
 	 */
-	@ApiModelProperty(value = "纠纷方2姓名")
+	@ApiModelProperty(value = "当事人2姓名")
 	private String nameTwo;
 	/**
-	 * 纠纷方2电话
+	 * 当事人2性别
 	 */
-	@ApiModelProperty(value = "纠纷方2电话")
+	@ApiModelProperty(value = "当事人2性别")
+	private Integer genderTwo;
+	/**
+	 * 当事人2电话
+	 */
+	@ApiModelProperty(value = "当事人2电话")
 	private String phoneTwo;
 	/**
-	 * 纠纷方2身份证号码
+	 * 当事人2身份证号码
 	 */
-	@ApiModelProperty(value = "纠纷方2身份证号码")
+	@ApiModelProperty(value = "当事人2身份证号码")
 	private String idCardTwo;
 	/**
 	 * 纠纷类型  业务字典:disputeType

--
Gitblit v1.9.3