From b1f7d9f1c9a23c2e360d93d1ee60e03cc94a78d2 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 12 Jan 2026 11:08:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java |   31 +++++++++++++------------------
 1 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
index 2587640..1550dab 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
@@ -19,14 +19,15 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.sxkj.fw.area.entity.FwAreaDivideEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalTime;
+import java.time.LocalDateTime;
 
 /**
  * 区域划分表 数据传输对象实体类
@@ -91,25 +92,19 @@
 	@ApiModelProperty(value = "关联派出所id")
 	private Long policeStationId;
 	/**
-	 * 可飞行时间段-开始
+	 * 可飞行日期时间-开始
 	 */
-	@ApiModelProperty(value = "可飞行时间段-开始")
-	private LocalTime flyTimeStart;
+	@ApiModelProperty(value = "可飞行日期时间-开始")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime flyDateStart;
 	/**
-	 * 可飞行时间段-结束
+	 * 可飞行日期时间-结束
 	 */
-	@ApiModelProperty(value = "可飞行时间段-结束")
-	private LocalTime flyTimeEnd;
-	/**
-	 * 可飞行日期-开始
-	 */
-	@ApiModelProperty(value = "可飞行日期-开始")
-	private LocalDate flyDateStart;
-	/**
-	 * 可飞行日期-结束
-	 */
-	@ApiModelProperty(value = "可飞行日期-结束")
-	private LocalDate flyDateEnd;
+	@ApiModelProperty(value = "可飞行日期时间-结束")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime flyDateEnd;
 	/**
 	 * 区域编码
 	 */

--
Gitblit v1.9.3