From 1c14ed902b327f8add38dac4311acd2894aea5e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 04 八月 2025 10:47:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index 183ac46..c99a141 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -443,6 +443,8 @@
     private String promotionUser;
 
     private String promotionPhone;
+    
+    private String travelId;
 
 
     public String getPromotionUser() {
@@ -1196,7 +1198,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 "OrderPrivateCar{" +

--
Gitblit v1.7.1