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/entity/FwAreaDivideEntity.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
index 6caafd0..c63053d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwAreaDivideEntity.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,8 +26,7 @@
import org.springblade.core.mp.base.BaseEntity;
import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalTime;
+import java.time.LocalDateTime;
/**
* 区域划分表 实体类
@@ -101,29 +101,19 @@
@ApiModelProperty(value = "关联派出所id")
private Long policeStationId;
/**
- * 可飞行时间段-开始
- */
- @TableField("fly_time_start")
- @ApiModelProperty(value = "可飞行时间段-开始")
- private LocalTime flyTimeStart;
- /**
- * 可飞行时间段-结束
- */
- @TableField("fly_time_end")
- @ApiModelProperty(value = "可飞行时间段-结束")
- private LocalTime flyTimeEnd;
- /**
- * 可飞行日期-开始
+ * 可飞行日期时间-开始
*/
@TableField("fly_date_start")
- @ApiModelProperty(value = "可飞行日期-开始")
- private LocalDate flyDateStart;
+ @ApiModelProperty(value = "可飞行日期时间-开始")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime flyDateStart;
/**
- * 可飞行日期-结束
+ * 可飞行日期时间-结束
*/
@TableField("fly_date_end")
- @ApiModelProperty(value = "可飞行日期-结束")
- private LocalDate flyDateEnd;
+ @ApiModelProperty(value = "可飞行日期时间-结束")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime flyDateEnd;
/**
* 区域编码
*/
--
Gitblit v1.9.3