From bb82c543675698d16eb80ae2bc6b82593fae8491 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 21 八月 2023 11:11:17 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 4265963..e57bb9c 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -91,10 +93,10 @@
private Integer proGroupId;
@ApiModelProperty(value = "鍚堟牸鏁伴噺", example = "1")
- private Integer qualifiedNum;
+ private BigDecimal qualifiedNum;
@ApiModelProperty(value = "涓嶅悎鏍兼暟閲�", example = "1")
- private Integer unqualifiedNum;
+ private BigDecimal unqualifiedNum;
@ApiModelProperty(value = "妫�楠屼汉鍛樼紪鐮�", example = "1")
private Integer checkUserId;
@@ -541,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