From 0a8119461bea9b913819d302b8820f1dc2cf420c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 07 一月 2025 17:07:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwTransitRecordQuery.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwTransitRecordQuery.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwTransitRecordQuery.java
index fba963f..e7970f2 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwTransitRecordQuery.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwTransitRecordQuery.java
@@ -7,6 +7,7 @@
import lombok.EqualsAndHashCode;
import java.util.Date;
+import java.util.List;
/**
* @author mitao
@@ -16,6 +17,7 @@
@EqualsAndHashCode(callSuper = true)
@ApiModel("运输记录查询数据传输对象")
public class MwTransitRecordQuery extends BasePage {
+
private static final long serialVersionUID = 3585169031300259198L;
@ApiModelProperty("路线id")
@@ -31,8 +33,13 @@
private Integer status;
@ApiModelProperty("运输开始时间")
- private Date startTime;
+ private List<String> startTime;
@ApiModelProperty("运输结束时间")
- private Date endTime;
+ private List<String> endTime;
+
+ private Date startTimeStart;
+ private Date startTimeEnd;
+ private Date endTimeStart;
+ private Date endTimeEnd;
}
--
Gitblit v1.7.1