From 43e421527417d4bf6ceb013777edc8747ffb8e1f Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 13:42:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 02a24b5..682b41c 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java
@@ -41,6 +41,12 @@
 	 */
 	@ApiModelProperty(value = "事发纬度")
 	private String lat;
+
+	/** 事发时间 */
+	@ApiModelProperty(value = "事发时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField(value = "event_time")
+	private Date eventTime;
 	/**
 	 * 纠纷方1姓名
 	 */
@@ -90,7 +96,7 @@
 	 * 受伤情况描述
 	 */
 	@ApiModelProperty(value = "受伤情况描述")
-	private Integer injuryDesc;
+	private String injuryDesc;
 	/**
 	 * 报警次数
 	 */

--
Gitblit v1.9.3