Merge remote-tracking branch 'origin/master'

liujie

8 天以前 7342170db7dc39326698d39b74e1858502fd574a

 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;
@@ -344,6 +343,8 @@

    private String splitAllocation;


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

@@ -351,6 +352,47 @@
    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;
@@ -904,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{" +