From aa241a47c90ed776062adf0b8daccf288a21836f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 10 八月 2023 09:55:54 +0800
Subject: [PATCH] 合并代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java | 8 +++++++-
1 files changed, 7 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 51450e0..d59cc34 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
@@ -9,6 +9,8 @@
public class OrderInfoWarpper {
@ApiModelProperty("订单id")
private Long id;
+ @ApiModelProperty("用户id")
+ private Integer userId;
@ApiModelProperty("用户头像")
private String avatar;
@ApiModelProperty("用户名称")
@@ -41,12 +43,16 @@
private String endLat;
@ApiModelProperty("终点经度")
private String endLng;
+ @ApiModelProperty("预估费用")
+ private Double estimatedPrice;
@ApiModelProperty("预估里程")
private Double estimatedMileage;
+ @ApiModelProperty("预估时间")
+ private Double estimatedTime;
@ApiModelProperty("起步价")
private Double startPrice;
@ApiModelProperty("等待时长")
- private Integer waitTime;
+ private String waitTime;
@ApiModelProperty("行驶里程")
private Double actualMileage;
@ApiModelProperty("行驶时间")
--
Gitblit v1.7.1