diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java
index 0f667df..15e6ad7 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java
+++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java
@@ -1,4 +1,4 @@
-package com.yingji.entity;
+package com.ruoyi.page.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -47,12 +47,17 @@ public class Fire implements Serializable {
      * 归队时间
      */
     @ApiModelProperty(value = "归队时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date gdsj;
+
     private String jjyxm;
     /**
      * 时间戳
      */
     @ApiModelProperty(value = "时间戳")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sjc;
     /**
      * 纬度
@@ -73,6 +78,8 @@ public class Fire implements Serializable {
      * 结束时间
      */
     @ApiModelProperty(value = "结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date jssj;
     /**
      * 案发地址
@@ -83,6 +90,8 @@ public class Fire implements Serializable {
      * 出动时间
      */
     @ApiModelProperty(value = "出动时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cdsj;
     /**
      * 立案方式代码
@@ -94,6 +103,9 @@ public class Fire implements Serializable {
      */
     @ApiModelProperty(value = "topic")
     private String topic;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date xdsj;
     /**
      * 立案时间
@@ -111,11 +123,15 @@ public class Fire implements Serializable {
      * 到达现场时间
      */
     @ApiModelProperty(value = "到达现场时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ddxcsj;
     /**
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 }
 
diff --git a/RuoYi-Vue/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/RuoYi-Vue/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 15bf66b..6a36b17 100644
--- a/RuoYi-Vue/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/RuoYi-Vue/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -7,6 +7,7 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * Entity基类
@@ -25,14 +26,16 @@ public class BaseEntity implements Serializable
     private String createBy;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 更新者 */
     private String updateBy;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /** 备注 */