From ecf282fb285fbba74ff129a4be8a129aa0d8ceb1 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 22 三月 2023 22:35:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java index 4825eed..8bf3d43 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java @@ -129,6 +129,11 @@ */ private Date createTime; + /** + * 行程录音 + */ + private String routeRecord; + @ApiModelProperty(value = "起步里程(公里)") private Double startDistance; @@ -177,6 +182,25 @@ @ApiModelProperty(value = "恶劣天气超出费") private BigDecimal overBadWeatherPrice; + @ApiModelProperty(value = "折扣优惠金额") + private BigDecimal discountAmount; + + public String getRouteRecord() { + return routeRecord; + } + + public void setRouteRecord(String routeRecord) { + this.routeRecord = routeRecord; + } + + public BigDecimal getDiscountAmount() { + return discountAmount; + } + + public void setDiscountAmount(BigDecimal discountAmount) { + this.discountAmount = discountAmount; + } + public Double getStartDistance() { return startDistance; } -- Gitblit v1.7.1