Merge remote-tracking branch 'origin/master'

guyue

3 天以前 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9

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

@@ -344,6 +344,28 @@

    private String abnormalRemark;


    private Integer promotionDriverId;


    private BigDecimal promotionMoney;

    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 Integer getAbnormalStatus() {
        return abnormalStatus;
    }