From 2cc5a1afe8296d148f0a32989395d538e5323a8e Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 18 一月 2024 16:22:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 97ed85d..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
@@ -110,7 +110,49 @@
@Excel(name = "澶囨敞")
private String remarks;
- public void setId(Long id)
+ /** CVT鎶ュ伐 */
+ @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;
+ }
+
+ public void setReport30(String report30) {
+ this.report30 = report30;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
--
Gitblit v1.9.3