From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
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