From 9d72eb559e67e3f0bb321198fc562f3cfd9a8625 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 21 一月 2024 20:54:33 +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 | 9 +++++----
1 files changed, 5 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..2d556c4 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;
@@ -82,4 +78,9 @@
@ApiModelProperty(value = "鍏抽棴鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime closeTime;
+ /**
+ * 鐘舵��
+ */
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer state;
}
--
Gitblit v1.8.0