From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev

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

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java
index 176dceb..c280051 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java
@@ -14,11 +14,11 @@
     @ApiModelProperty("司机经度")
     private String driverLng;
     @ApiModelProperty("等待时长(分钟)")
-    private Integer waitTime;
+    private String waitTime;
     @ApiModelProperty("行驶里程(公里)")
     private Double actualMileage;
     @ApiModelProperty("行驶时间(分钟)")
-    private Integer travelTime;
+    private String travelTime;
     @ApiModelProperty("101=待接单,102=已接单,103=前往预约点,104=到达预约点,105=开始服务,106=到达目的地,107=待支付,108=待评价,109=已完成,201=转单中,301=已取消,401=等待中")
     private Integer state;
 }

--
Gitblit v1.7.1