From 9af336a5be2483d67b5dbbf02d87e1e54185014f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 23 七月 2024 14:52:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java |   67 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 9 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 380e941..a2c2c8f 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,11 +1,14 @@
 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;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -16,6 +19,7 @@
  * @author 吕雪
  * @since 2020-09-02
  */
+@Data
 @TableName("t_order_private_car")
 public class TOrderPrivateCar extends Model<TOrderPrivateCar> {
 
@@ -30,6 +34,38 @@
      * 类型（1=普通订单，2=摆渡订单）
      */
     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
      */
@@ -132,7 +168,8 @@
     private BigDecimal orderMoney;
 
     private Double waitMoney;
-
+    private Integer moneyType;
+    private String moneyTime;
     /**
      * 起步价
      */
@@ -168,7 +205,7 @@
     /**
      * 红包记录id
      */
-    private Integer redPacketId;
+    private String redPacketId;
     /**
      * 优惠券id
      */
@@ -287,6 +324,8 @@
     private BigDecimal abnormalMoney;
 
     private Integer isFrozen;
+    
+    private String tripId;
 
     public Integer getIsFrozen() {
         return isFrozen;
@@ -600,13 +639,7 @@
         this.couponMoney = couponMoney;
     }
 
-    public Integer getRedPacketId() {
-        return redPacketId;
-    }
 
-    public void setRedPacketId(Integer redPacketId) {
-        this.redPacketId = redPacketId;
-    }
 
     public Integer getCouponId() {
         return couponId;
@@ -831,7 +864,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