From 1cac5ccf16e3ecf3551704abbc072b61e0349c52 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 16:00:06 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
index 1bf2b5a..64fb66e 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
@@ -1,5 +1,6 @@
package com.matrix.system.padApi.dto;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.app.dto.BasePageDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,8 +20,30 @@
@ApiModelProperty(value = "查询字段")
private String queryKey;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- private Date orderTime;
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+// private Date orderTime;
+
+ public Date getBeginTimeVo() {
+ return beginTimeVo;
+ }
+
+ public void setBeginTimeVo(Date beginTimeVo) {
+ this.beginTimeVo = beginTimeVo;
+ }
+
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ private Date beginTimeVo;
+
+ public Date getEndTimeVo() {
+ return endTimeVo;
+ }
+
+ public void setEndTimeVo(Date endTimeVo) {
+ this.endTimeVo = endTimeVo;
+ }
+
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ private Date endTimeVo;
@ApiModelProperty(hidden = true)
private Long shopId;
@@ -28,13 +51,13 @@
@ApiModelProperty(hidden = true)
private Long companyId;
- public Date getOrderTime() {
- return orderTime;
- }
-
- public void setOrderTime(Date orderTime) {
- this.orderTime = orderTime;
- }
+// public Date getOrderTime() {
+// return orderTime;
+// }
+//
+// public void setOrderTime(Date orderTime) {
+// this.orderTime = orderTime;
+// }
public Long getCompanyId() {
return companyId;
--
Gitblit v1.9.1