From c441ee63996286f6e6bd92ecd51dbf2239d2d8ef Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 16:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java | 5 +++++
1 files changed, 5 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 c539ca0..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
@@ -43,7 +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;
@@ -76,5 +80,6 @@
* 鍏抽棴鏃堕棿
*/
@ApiModelProperty(value = "鍏抽棴鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime closeTime;
}
--
Gitblit v1.8.0