From ddba15cfd1d654dc41de5dfdc587e12d96d84f4f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 04 八月 2025 17:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
index 53706e5..021936b 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
-import com.stylefeng.guns.modular.system.model.BaseBean;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -360,6 +359,8 @@
     private String promotionUser;
 
     private String promotionPhone;
+    
+    private String travelId;
 
 
     public String getPromotionUser() {
@@ -945,7 +946,15 @@
     public void setSplitAllocation(String splitAllocation) {
         this.splitAllocation = splitAllocation;
     }
-
+    
+    public String getTravelId() {
+        return travelId;
+    }
+    
+    public void setTravelId(String travelId) {
+        this.travelId = travelId;
+    }
+    
     @Override
     public String toString() {
         return "OrderTaxi{" +

--
Gitblit v1.7.1