From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionDO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionDO.java b/src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionDO.java
index e206228..199fc7d 100644
--- a/src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionDO.java
+++ b/src/main/java/com/gk/hotwork/Domain/SafetySelfInspectionDO.java
@@ -57,7 +57,7 @@
private Date inspectionStartTime;
/** 检查结束时间 **/
- @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date inspectionEndTime;
/** 主键id id **/
--
Gitblit v1.9.2