From 2a498d9f65f873cedb74ab5bcb48ad4b845d0622 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 10:01:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 5cc3687..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,20 +163,20 @@
@TableField("overLongDistancePrice")
private Double overLongDistancePrice;
/**
- * 等待时长（分钟）
+ * 等待时长（s）
*/
@TableField("waitTime")
- private Double waitTime;
+ private Integer waitTime;
/**
* 等待费
*/
@TableField("waitTimePrice")
private Double waitTimePrice;
/**
- * 超出等待时长（分钟）
+ * 超出等待时长（s）
*/
@TableField("outWaitTime")
- private Double outWaitTime;
+ private Integer outWaitTime;
/**
* 超出等待时长费
*/
@@ -302,4 +302,9 @@
*/
@TableField("routeRecord")
private String routeRecord;
+ /**
+ * 节假日价格
+ */
+ @TableField("holidayPrice")
+ private Double holidayPrice;
}
--
Gitblit v1.7.1