Merge remote-tracking branch 'origin/master'

Pu Zhibing

8 天以前 4041cb7dafbd2fd394b31d95c5e64528b9f91505

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

@@ -410,6 +410,10 @@
    @TableField("voice")
    private String voice;

    private Date voiceTime;



    /**
     * 预估里程(米)
     */
@@ -435,6 +439,15 @@
    // 推广司机id
    private Integer promotionDriverId;


    public Date getVoiceTime() {
        return voiceTime;
    }

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

    public String getVoice() {
        return voice;
    }