From 753c4aede53b07041841d9aa94859b59e366bd5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 18:47:39 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving

---
 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