From e961f056e30efbfea5357f1bcbbb68c8d495e325 Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期一, 31 十月 2022 15:51:21 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
index 3226c81..dd9e24b 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
@@ -1,5 +1,7 @@
package com.ycl.dto.dispatch;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,7 +30,8 @@
* 鏃堕棿
*/
@ApiModelProperty(value = "鏃堕棿")
- private LocalDateTime investigationTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String investigationTime;
/**
* 鍦板潃
@@ -66,7 +69,8 @@
* 鍒拌揪鏃堕棿
*/
@ApiModelProperty(value = "鍒拌揪鏃堕棿")
- private LocalDateTime arrivalTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String arrivalTime;
/**
* 鍒拌揪鍦板潃
@@ -115,13 +119,15 @@
* 鏂囦功鍙戞斁鏃堕棿
*/
@ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
- private LocalDateTime sendTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String sendTime;
/**
* 鏂囦功闄愬畾鏃堕棿
*/
@ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
- private LocalDateTime limitTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String limitTime;
/**
* 鏂囦功鍙戞斁鍐呭
@@ -133,7 +139,8 @@
* 瀹為檯鏁存敼鏃堕棿
*/
@ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
- private LocalDateTime rectifyTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String rectifyTime;
/**
* 鏁存敼鎯呭喌
--
Gitblit v1.8.0