From cdb2e3a30d1b3b246bb62310926a3e2d2c70ac2c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 21:42:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/excel/GdClueEventExcel.java |   31 +++++++++----------------------
 1 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/excel/GdClueEventExcel.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/excel/GdClueEventExcel.java
index 405dc61..aa4fe02 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/excel/GdClueEventExcel.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/excel/GdClueEventExcel.java
@@ -24,7 +24,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -66,35 +65,23 @@
 	@ExcelProperty("处置部门")
 	private String disposeDept;
 	/**
-	 * 分发人员
+	 * 经度
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("分发人员")
-	private String distributeUser;
+	@ExcelProperty("经度")
+	private Double longitude;
 	/**
-	 * 分发部门
+	 * 纬度
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("分发部门")
-	private String distributeDept;
+	@ExcelProperty("纬度")
+	private Double latitude;
 	/**
-	 * 分发时间
+	 * 状态:0未分发、1已分发、2已驳回
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("分发时间")
-	private Date distributeTime;
-	/**
-	 * 工单位置(经纬度)
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("工单位置(经纬度)")
-	private byte[] workOrderLocation;
-	/**
-	 * 状态:0未知、1已分发、2已驳回
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("状态:0未知、1已分发、2已驳回")
-	private Byte eventStatus;
+	@ExcelProperty("状态:0未分发、1已分发、2已驳回")
+	private Integer eventStatus;
 	/**
 	 * 区域编码
 	 */

--
Gitblit v1.9.3