Merge remote-tracking branch 'origin/master'

guyue

2025-08-01 0f79643e35af90cb63a4b3c67ee72abfe0e37770

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java

@@ -444,6 +444,8 @@

    private String promotionPhone;

    private String travelId;


    public String getPromotionUser() {
        return promotionUser;
@@ -1197,6 +1199,14 @@
        this.splitAllocation = splitAllocation;
    }

    public String getTravelId() {
        return travelId;
    }
    
    public void setTravelId(String travelId) {
        this.travelId = travelId;
    }
    
    @Override
    public String toString() {
        return "OrderPrivateCar{" +