From 0b7f075c3352ccba4b21dba5df3ae03ae0c787fd Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 29 十一月 2022 17:33:10 +0800
Subject: [PATCH] fix: 上传处置违建文书时间错误
---
ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
index de9c27b..4252d78 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
@@ -1,5 +1,6 @@
package com.ycl.vo.casePool;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -42,6 +43,11 @@
* 鎶ヨ鏃堕棿
*/
@ApiModelProperty(value = "鎶ヨ鏃堕棿")
+<<<<<<< .mine
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+=======
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+>>>>>>> .theirs
private LocalDateTime alarmTime;
@@ -69,4 +75,11 @@
*/
@ApiModelProperty(value = "鎸佺画鏃堕棿")
private String continueTime;
+
+ /**
+ * 鍏抽棴鏃堕棿
+ */
+ @ApiModelProperty(value = "鍏抽棴鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime closeTime;
}
--
Gitblit v1.8.0