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

Pu Zhibing

5 天以前 0c41f99c7f1a0d7deeeef23a5b3b890aed32ce63

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java

@@ -310,7 +310,25 @@
    private Integer promotionDriverId;

    private BigDecimal promotionMoney;
    private String voice;

    private Date voiceTime;

    public String getVoice() {
        return voice;
    }

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

    public Date getVoiceTime() {
        return voiceTime;
    }

    public void setVoiceTime(Date voiceTime) {
        this.voiceTime = voiceTime;
    }
    public BigDecimal getPromotionMoney() {
        return promotionMoney;
    }