Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

8 天以前 3a0bef313cbc6cd71bcb234d208805c022827e13

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java

@@ -4,8 +4,8 @@
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;

/**
@@ -342,6 +342,81 @@
    private String bindId;

    private String splitAllocation;


    private Integer promotion;
    // 推广应的金额
    private BigDecimal promotionMoney;

    // 推广司机id
    private Integer promotionDriverId;

    private String voice;


    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;
    }

    public void setPromotion(Integer promotion) {
        this.promotion = promotion;
    }

    public Date getVoiceTime() {
        return voiceTime;
    }

    public void setVoiceTime(Date voiceTime) {
        this.voiceTime = voiceTime;
    }

    public String getVoice() {
        return voice;
    }

    public void setVoice(String voice) {
        this.voice = voice;
    }

    public BigDecimal getPromotionMoney() {
        return promotionMoney;
    }

    public void setPromotionMoney(BigDecimal promotionMoney) {
        this.promotionMoney = promotionMoney;
    }

    public Integer getPromotionDriverId() {
        return promotionDriverId;
    }

    public void setPromotionDriverId(Integer promotionDriverId) {
        this.promotionDriverId = promotionDriverId;
    }

    public Integer getId() {
        return id;
@@ -871,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{" +