修改bug

Pu Zhibing

2 天以前 cb7e84fe6e40f3ce3ed1fe3fb3b4c0da8c847793

 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;



    /**
     * 预估里程(米)
     */
@@ -428,12 +432,84 @@
    private Integer driverCancle;


    private Integer promotion;

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

    // 推广司机id
    private Integer promotionDriverId;

    private String promotionUser;

    private String promotionPhone;
    
    private String travelId;
    /**
     * 是否异常订单 1否 2是
     */
    @TableField("abnormal")
    private Integer abnormal;

    private Long promotionActivityId;
    /**
     * 中台是否已创建订单（0=否，1=是）
     */
    private Integer isCreated;
    /**
     * 是否是追缴单（0=否，1=是）
     */
    private Integer recoveryOrder;
    /**
     * 是否生成追缴单（0=否，1=是）
     */
    private Integer isGenerateRecoveryOrder;
    /**
     * 原始订单id
     */
    private Integer oldOrderId;


    private Integer abnormalStatus;

    private Integer responsibilityType;

    private BigDecimal responsibilityMoney;

    private String abnormalRemark;


    public String getPromotionUser() {
        return promotionUser;
    }

    public void setPromotionUser(String promotionUser) {
        this.promotionUser = promotionUser;
    }

    public String getPromotionPhone() {
        return promotionPhone;
    }

    public void setPromotionPhone(String promotionPhone) {
        this.promotionPhone = promotionPhone;
    }

    public Integer getPromotion() {
        return promotion;
    }

    public void setPromotion(Integer promotion) {
        this.promotion = promotion;
    }

    public Date getVoiceTime() {
        return voiceTime;
    }

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

    public String getVoice() {
        return voice;
@@ -1154,6 +1230,94 @@
    public void setSplitAllocation(String splitAllocation) {
        this.splitAllocation = splitAllocation;
    }
    
    public String getTravelId() {
        return travelId;
    }
    
    public void setTravelId(String travelId) {
        this.travelId = travelId;
    }

    public Integer getAbnormal() {
        return abnormal;
    }

    public void setAbnormal(Integer abnormal) {
        this.abnormal = abnormal;
    }

    public Long getPromotionActivityId() {
        return promotionActivityId;
    }

    public void setPromotionActivityId(Long promotionActivityId) {
        this.promotionActivityId = promotionActivityId;
    }

    public Integer getIsCreated() {
        return isCreated;
    }

    public void setIsCreated(Integer isCreated) {
        this.isCreated = isCreated;
    }

    public Integer getRecoveryOrder() {
        return recoveryOrder;
    }

    public void setRecoveryOrder(Integer recoveryOrder) {
        this.recoveryOrder = recoveryOrder;
    }

    public Integer getIsGenerateRecoveryOrder() {
        return isGenerateRecoveryOrder;
    }

    public void setIsGenerateRecoveryOrder(Integer isGenerateRecoveryOrder) {
        this.isGenerateRecoveryOrder = isGenerateRecoveryOrder;
    }

    public Integer getOldOrderId() {
        return oldOrderId;
    }

    public void setOldOrderId(Integer oldOrderId) {
        this.oldOrderId = oldOrderId;
    }

    public Integer getAbnormalStatus() {
        return abnormalStatus;
    }

    public void setAbnormalStatus(Integer abnormalStatus) {
        this.abnormalStatus = abnormalStatus;
    }

    public Integer getResponsibilityType() {
        return responsibilityType;
    }

    public void setResponsibilityType(Integer responsibilityType) {
        this.responsibilityType = responsibilityType;
    }

    public BigDecimal getResponsibilityMoney() {
        return responsibilityMoney;
    }

    public void setResponsibilityMoney(BigDecimal responsibilityMoney) {
        this.responsibilityMoney = responsibilityMoney;
    }

    public String getAbnormalRemark() {
        return abnormalRemark;
    }

    public void setAbnormalRemark(String abnormalRemark) {
        this.abnormalRemark = abnormalRemark;
    }

    @Override
    public String toString() {