From 5af5d1d3134ebd217630c07245dd072942cbf9a4 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 31 十二月 2020 16:03:18 +0800
Subject: [PATCH] Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit/r/android/OkGoinCar into cargo_small
---
app/src/main/java/com/okgoincar/bean/OrderBean.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/bean/OrderBean.java b/app/src/main/java/com/okgoincar/bean/OrderBean.java
index 03dc4e3..3735216 100644
--- a/app/src/main/java/com/okgoincar/bean/OrderBean.java
+++ b/app/src/main/java/com/okgoincar/bean/OrderBean.java
@@ -72,7 +72,7 @@
private double startDistance;
private double startLat;
private double startLon;
- private double tipMoney;
+ private Double tipMoney;
private double totalDistance;
private String travelTime;
private String travelTime_;
@@ -82,6 +82,28 @@
private String type;
private String emergencyCall;
private String peopleNumber;
+ private String differenceMoney;
+ private String cargoType;
+
+ public String getCargoType() {
+ return cargoType;
+ }
+
+ public void setCargoType(String cargoType) {
+ this.cargoType = cargoType;
+ }
+
+ public void setTipMoney(Double tipMoney) {
+ this.tipMoney = tipMoney;
+ }
+
+ public String getDifferenceMoney() {
+ return differenceMoney;
+ }
+
+ public void setDifferenceMoney(String differenceMoney) {
+ this.differenceMoney = differenceMoney;
+ }
public String getPeopleNumber() {
return peopleNumber;
@@ -275,7 +297,7 @@
return startLon;
}
- public double getTipMoney() {
+ public Double getTipMoney() {
return tipMoney;
}
--
Gitblit v1.7.1