From e0cc9278a0bcbf480446f87a78b9d7ddd8819eeb Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java b/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
index 5597898..9a4a2dc 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
@@ -5,7 +5,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.Date;
import lombok.Data;
/**
* 璋冨害鍗曞璞� dispatch_order
@@ -209,16 +208,9 @@
@TableField("is_deleted")
private Integer isDeleted;
- public String getActualDepartureTimeBegin() {
- return actualDepartureTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
- }
-
public void setActualDepartureTimeBegin(String actualDepartureTimeBegin) {
- this.actualDepartureTimeBegin = actualDepartureTimeBegin;
- }
+ this.actualDepartureTimeBegin = actualDepartureTimeBegin!=null?actualDepartureTimeBegin+" 00:00:00":null;
- public String getActualDepartureTimeEnd() {
- return actualDepartureTimeEnd;
}
public void setActualDepartureTimeEnd(String actualDepartureTimeEnd) {
@@ -227,34 +219,19 @@
- public String getRequiredArrivalTimeBegin() {
- return requiredArrivalTimeBegin;
- }
public void setRequiredArrivalTimeBegin(String requiredArrivalTimeBegin) {
this.requiredArrivalTimeBegin = requiredArrivalTimeBegin!=null?requiredArrivalTimeBegin+" 00:00:00":null;
}
- public String getRequiredArrivalTimeEnd() {
- return requiredArrivalTimeEnd;
- }
public void setRequiredArrivalTimeEnd(String requiredArrivalTimeEnd) {
this.requiredArrivalTimeEnd = requiredArrivalTimeEnd!=null?requiredArrivalTimeEnd+" 23:59:59":null;
}
-
- public String getActualArrivalTimeBegin() {
- return actualArrivalTimeBegin;
- }
-
public void setActualArrivalTimeBegin(String actualArrivalTimeBegin) {
this.actualArrivalTimeBegin = actualArrivalTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
- }
-
- public String getActualArrivalTimeEnd() {
- return actualArrivalTimeEnd;
}
public void setActualArrivalTimeEnd(String actualArrivalTimeEnd) {
--
Gitblit v1.8.0