From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 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..07a9452 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,46 @@
@ApiModelProperty(value = "恶劣天气超出费")
private BigDecimal overBadWeatherPrice;
+ @ApiModelProperty(value = "折扣优惠金额")
+ private BigDecimal discountAmount;
+ @ApiModelProperty(value = "实际里程（米）")
+ private Integer actualMileage;
+
+ @ApiModelProperty(value = "是否已开票 1是 0否")
+ private Integer isInvoice;
+
+ public Integer getIsInvoice() {
+ return isInvoice;
+ }
+
+ public void setIsInvoice(Integer isInvoice) {
+ this.isInvoice = isInvoice;
+ }
+
+ public Integer getActualMileage() {
+ return actualMileage;
+ }
+
+ public void setActualMileage(Integer actualMileage) {
+ this.actualMileage = actualMileage;
+ }
+
+ 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