From 997bf5ea58c2741b1862a1010bf5d60a32850c4f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 三月 2023 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index 6551ed8..4f23569 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -329,6 +329,12 @@
*/
@TableField("reassignNotice")
private Integer reassignNotice;
+ /**
+ * 司机支付状态（现金支付司机代支付）1待支付 2已支付
+ * @return
+ */
+ @TableField("driverPay")
+ private Integer driverPay;
public Integer getId() {
return id;
@@ -827,6 +833,14 @@
this.reassignNotice = reassignNotice;
}
+ public Integer getDriverPay() {
+ return driverPay;
+ }
+
+ public void setDriverPay(Integer driverPay) {
+ this.driverPay = driverPay;
+ }
+
@Override
public String toString() {
return "OrderLogistics{" +
--
Gitblit v1.7.1