From 34eb869e7350173ff036881fc776bc27d5be6d7a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 09:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
index 843f2d0..890ba37 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
@@ -163,7 +163,7 @@
@TableField("overLongDistancePrice")
private Double overLongDistancePrice;
/**
- * 等待时长（分钟）
+ * 等待时长（s）
*/
@TableField("waitTime")
private Integer waitTime;
@@ -173,7 +173,7 @@
@TableField("waitTimePrice")
private Double waitTimePrice;
/**
- * 超出等待时长（分钟）
+ * 超出等待时长（s）
*/
@TableField("outWaitTime")
private Integer outWaitTime;
@@ -217,6 +217,11 @@
*/
@TableField("estimatedMileage")
private Double estimatedMileage;
+ /**
+ * 预估时间
+ */
+ @TableField("estimatedTime")
+ private Integer estimatedTime;
/**
* 订单金额
*/
@@ -292,4 +297,14 @@
*/
@TableField("createTime")
private Date createTime;
+ /**
+ * 行程录音地址
+ */
+ @TableField("routeRecord")
+ private String routeRecord;
+ /**
+ * 节假日价格
+ */
+ @TableField("holidayPrice")
+ private Double holidayPrice;
}
--
Gitblit v1.7.1