From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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..989b5a3 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
@@ -218,6 +218,11 @@
     @TableField("estimatedMileage")
     private Double estimatedMileage;
     /**
+     * 预估时间
+     */
+    @TableField("estimatedTime")
+    private Integer estimatedTime;
+    /**
      * 订单金额
      */
     @TableField("orderMoney")
@@ -292,4 +297,9 @@
      */
     @TableField("createTime")
     private Date createTime;
+    /**
+     * 行程录音地址
+     */
+    @TableField("routeRecord")
+    private String routeRecord;
 }

--
Gitblit v1.7.1