From d0c88e9f82a73e225ec04f3f8b533cf1d97028bc Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 17 八月 2023 11:49:21 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving --- driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java | 6 ++++-- 1 files changed, 4 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..29b8571 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,13 @@ @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; + @ApiModelProperty("取消方(1=用户,2=司机,3=平台)") + private Integer cancelObject; } -- Gitblit v1.7.1