From ba2d06afaf5bb9992d810d3c5fea38886e89a8f0 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 18 一月 2024 10:10:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
index b03aeaf..ad4499b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
@@ -114,6 +114,36 @@
@Excel(name = "CVT鎶ュ伐")
private String report30;
+ private String[] dateConditions;
+
+ private String startTime;
+
+ private String endTime;
+
+ public String[] getDateConditions() {
+ return dateConditions;
+ }
+
+ public void setDateConditions(String[] dateConditions) {
+ this.dateConditions = dateConditions;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
public String getReport30() {
return report30;
}
--
Gitblit v1.9.3