From 1f45c25ea725445d7e78e8d5da6e72150f35f2eb Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 20 十二月 2024 11:09:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
index a4112cf..29c6df0 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -33,7 +35,7 @@
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "id")
- private Integer id;
+ private Long id;
/**
* 妗堜欢id(鍚寀ms_base_case琛╥d)
*/
@@ -77,11 +79,18 @@
@ApiModelProperty(value = "璺濈")
private Integer distance;
/**
- * 澶勭疆闄愭椂
+ * 璋冨害闄愭椂
*/
@TableField("dispose_date")
- @ApiModelProperty(value = "澶勭疆闄愭椂")
+ @ApiModelProperty(value = "璋冨害闄愭椂")
private Date disposeDate;
+
+ /**
+ * 闄愬埗鏃堕檺
+ */
+ @TableField("limit_time")
+ @ApiModelProperty(value = "璋冨害鏃堕檺")
+ private LocalDateTime limitTime;
/**
* 娲鹃仯鎰忚
*/
@@ -98,6 +107,7 @@
* 鍒涘缓鏃堕棿
*/
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
--
Gitblit v1.8.0