From 0d02ee0aeeaa7c4df579a57b6f75e59c69a1ed26 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:22:06 +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 5ee1079..4f0a43f 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,6 @@
package com.ycl.dto.dispatch;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@@ -31,7 +32,7 @@
*/
@ApiModelProperty(value = "鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime investigationTime;
+ private String investigationTime;
/**
* 鍦板潃
@@ -70,7 +71,7 @@
*/
@ApiModelProperty(value = "鍒拌揪鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime arrivalTime;
+ private String arrivalTime;
/**
* 鍒拌揪鍦板潃
@@ -120,14 +121,14 @@
*/
@ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime sendTime;
+ private String sendTime;
/**
* 鏂囦功闄愬畾鏃堕棿
*/
@ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime limitTime;
+ private String limitTime;
/**
* 鏂囦功鍙戞斁鍐呭
@@ -140,7 +141,7 @@
*/
@ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime rectifyTime;
+ private String rectifyTime;
/**
* 鏁存敼鎯呭喌
@@ -178,6 +179,12 @@
@ApiModelProperty(value = "鍏朵粬鐓х墖")
private String otherPic;
+ /**
+ * 鏂囦功妯℃澘鍊�
+ */
+ @ApiModelProperty(value = "鏂囦功妯℃澘鍊�")
+ private String value;
+
//褰撲簨浜�
/**
--
Gitblit v1.8.0