From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
index 5cf71df..13c7880 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
@@ -17,6 +17,8 @@
     private String userName;
     @ApiModelProperty("用户电话")
     private String userPhone;
+    @ApiModelProperty("司机id")
+    private Integer driverId;
     @ApiModelProperty("用户余额")
     private Double balance;
     @ApiModelProperty("下单次数")
@@ -52,7 +54,7 @@
     @ApiModelProperty("起步价")
     private Double startPrice;
     @ApiModelProperty("等待时长")
-    private Integer waitTime;
+    private String waitTime;
     @ApiModelProperty("行驶里程")
     private Double actualMileage;
     @ApiModelProperty("行驶时间")

--
Gitblit v1.7.1