From c29b1d7c9d312466cdbac1add88ee5c728135095 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 16:59:35 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
index 516169e..5429df0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.math.BigDecimal;
import java.util.Date;
@@ -34,6 +35,36 @@
*/
private Integer type;
private String remark;
+ @TableField("startMileage")
+ private Double startMileage;
+
+ private Integer startDuration;
+ @TableField("duration")
+ private Double duration;
+ @TableField("wait")
+ private Double wait;
+ @TableField("longDistance")
+ private Double longDistance;
+
+ @TableField("mileageKilometers")
+ private Double mileageKilometers;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* 用户id
@@ -137,7 +168,8 @@
private BigDecimal orderMoney;
private Double waitMoney;
-
+ private Integer moneyType;
+ private String moneyTime;
/**
* 起步价
*/
@@ -292,6 +324,8 @@
private BigDecimal abnormalMoney;
private Integer isFrozen;
+
+ private String tripId;
public Integer getIsFrozen() {
return isFrozen;
@@ -836,7 +870,23 @@
public void setServerCarModelId(Integer serverCarModelId) {
this.serverCarModelId = serverCarModelId;
}
-
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getTripId() {
+ return tripId;
+ }
+
+ public void setTripId(String tripId) {
+ this.tripId = tripId;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1