From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index 268b926..1b301d3 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -323,6 +323,12 @@
      */
     @TableField("reassignNotice")
     private Integer reassignNotice;
+    /**
+     * 司机支付状态(现金支付司机代支付)1待支付 2已支付
+     * @return
+     */
+    @TableField("driverPay")
+    private Integer driverPay;
 
     public Integer getId() {
         return id;
@@ -813,6 +819,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