From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +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 | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 780ebb7..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
@@ -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;
@@ -7,63 +8,74 @@
import java.time.LocalDateTime;
@Data
-@ApiModel("妗堜欢姹犺繚瑙勬浠�")
+@ApiModel(value = "妗堜欢姹犺繚瑙刅O")
public class CasePoolViolationVO {
+
+ @ApiModelProperty(value = "id")
+ private Integer id;
/**
* 浜嬩欢缂栧彿
*/
- @ApiModelProperty(value = "浜嬩欢缂栧彿", dataType = "String")
+ @ApiModelProperty(value = "浜嬩欢缂栧彿")
private String code;
/**
* 浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)
*/
- @ApiModelProperty(value = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)", dataType = "Integer")
+ @ApiModelProperty(value = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)")
private Integer eventSource;
/**
* 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
*/
- @ApiModelProperty(value = "鎶ヨ鐐逛綅", dataType = "String")
+ @ApiModelProperty(value = "鎶ヨ鐐逛綅")
private String site;
/**
* 鎵�灞炶閬�
*/
- @ApiModelProperty(value = "鎵�灞炶閬�", dataType = "Integer")
- private Integer streetId;
+ @ApiModelProperty(value = "鎵�灞炶閬�")
+ private String street;
/**
* 鎶ヨ鏃堕棿
*/
- @ApiModelProperty(value = "鎶ヨ鏃堕棿", dataType = "LocalDateTime")
+ @ApiModelProperty(value = "鎶ヨ鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime alarmTime;
/**
* 澶х被
*/
- @ApiModelProperty(value = "澶х被", dataType = "String")
+ @ApiModelProperty(value = "澶х被")
private String category;
/**
* 灏忕被
*/
- @ApiModelProperty(value = "灏忕被", dataType = "String")
+ @ApiModelProperty(value = "灏忕被")
private String type;
/**
* 妗堢敱
*/
- @ApiModelProperty(value = "妗堢敱", dataType = "String")
+ @ApiModelProperty(value = "妗堢敱")
private String actionCause;
/**
* 鎸佺画鏃堕棿
*/
- @ApiModelProperty(value = "鎸佺画鏃堕棿", dataType = "String")
+ @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