From 01a89c88265cabc16afbf101fe17b60a95a3f52a Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 03 三月 2023 16:38:01 +0800
Subject: [PATCH] 正式环境配置
---
ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java | 4 ----
1 files changed, 0 insertions(+), 4 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 4252d78..63e873d 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,11 +43,7 @@
* 鎶ヨ鏃堕棿
*/
@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;
--
Gitblit v1.8.0