Merge remote-tracking branch 'origin/master'

Pu Zhibing

9 天以前 4041cb7dafbd2fd394b31d95c5e64528b9f91505

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;

import java.math.BigDecimal;
import java.util.Date;

/**
@@ -406,6 +407,13 @@

    private Integer totalPeopleNum;

    @TableField("voice")
    private String voice;

    private Date voiceTime;



    /**
     * 预估里程(米)
     */
@@ -423,6 +431,47 @@

    private Integer driverCancle;



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

    // 推广司机id
    private Integer promotionDriverId;


    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 String getChargeRules() {
        return chargeRules;
    }