From 0c4507ad5ebdbf8ac1c2bbcdcf38203908e61378 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
index 07d3eb8..e57bb9c 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
@@ -543,10 +543,10 @@
private String mixParam;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String startDate;
@ApiModelProperty(value = "鎴鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String endDate;
}
--
Gitblit v1.9.3