Merge remote-tracking branch 'origin/master'

Pu Zhibing

9 天以前 4041cb7dafbd2fd394b31d95c5e64528b9f91505

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

@@ -352,6 +352,17 @@

    private String voice;


    private Date voiceTime;

    public Date getVoiceTime() {
        return voiceTime;
    }

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

    public String getVoice() {
        return voice;
    }