From 7a1b2baf3546f62f27327f5d4209ab4311069abc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 24 五月 2023 08:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/stylefeng/guns/modular/system/model/TransportInfo.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/model/TransportInfo.java b/src/main/java/com/stylefeng/guns/modular/system/model/TransportInfo.java
index adabd1d..4d6dc85 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/model/TransportInfo.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/model/TransportInfo.java
@@ -2,6 +2,7 @@
import lombok.Data;
+import java.util.Date;
import java.util.List;
@Data
@@ -17,4 +18,25 @@
private String contactEmail;
private List<OrderDriverInfo> list;
+
+ private String truckCompany;
+
+ private Date pickupTime;
+
+ private Integer streetTurn;
+ @ApiModelProperty(value = "1:YES 2:NO")
+ private Integer lineHold;
+ @ApiModelProperty(value = "1:YES 2:NO")
+ private Integer customHold;
+ @ApiModelProperty(value = "1:YES 2:NO")
+ private Integer pierpass;
+ @ApiModelProperty(value = "1:YES 2:NO")
+ private Integer CTF;
+
+ private String LFD;
+ @ApiModelProperty(value = "1:YES 2:NO")
+ private Integer closedArea;
+
+
+ private Date shipmentDate;
}
--
Gitblit v1.7.1