Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-04 1c14ed902b327f8add38dac4311acd2894aea5e1

 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;
@@ -357,6 +356,28 @@

    private Date voiceTime;

    private String promotionUser;

    private String promotionPhone;
    
    private String travelId;


    public String getPromotionUser() {
        return promotionUser;
    }

    public void setPromotionUser(String promotionUser) {
        this.promotionUser = promotionUser;
    }

    public String getPromotionPhone() {
        return promotionPhone;
    }

    public void setPromotionPhone(String promotionPhone) {
        this.promotionPhone = promotionPhone;
    }
    public Integer getPromotion() {
        return promotion;
    }
@@ -925,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{" +