From 9c19d5222d91bb191808d868aa056bfedbacb0c9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 03 六月 2023 02:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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..5cf71df 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,8 +43,12 @@
private String endLat;
@ApiModelProperty("终点经度")
private String endLng;
+ @ApiModelProperty("预估费用")
+ private Double estimatedPrice;
@ApiModelProperty("预估里程")
private Double estimatedMileage;
+ @ApiModelProperty("预估时间")
+ private Double estimatedTime;
@ApiModelProperty("起步价")
private Double startPrice;
@ApiModelProperty("等待时长")
--
Gitblit v1.7.1