From 9d2babb8bb99d55d76eab0558fd9f510652b270c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 11 六月 2024 15:16:17 +0800
Subject: [PATCH] 6.11

---
 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java
index 792fad4..20f8869 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -11,6 +12,7 @@
  * 包车订单
  */
 @TableName("t_order_chartered_car")
+@Data
 public class OrderCharteredCar {
     /**
      * 主键
@@ -42,12 +44,14 @@
      * 用车时长
      */
     @TableField("carTime")
-    private Integer carTime;
+    private double carTime;
     /**
      * 车型
      */
     @TableField("serverCarModelId")
     private Integer serverCarModelId;
+    @TableField("serviceId")
+    private Integer serviceId;
     /**
      * 车型用途
      */
@@ -78,6 +82,36 @@
      */
     @TableField("remark")
     private String remark;
+    @TableField("newRemark")
+    private String newRemark;
+
+    @TableField("startLon")
+    private Double startLon;
+    /**
+     * 起点纬度
+     */
+    @TableField("startLat")
+    private Double startLat;
+    /**
+     * 起点
+     */
+    @TableField("startAddress")
+    private String startAddress;
+    /**
+     * 目的地经度
+     */
+    @TableField("endLon")
+    private Double endLon;
+    /**
+     * 目的地纬度
+     */
+    @TableField("endLat")
+    private Double endLat;
+    /**
+     * 目的地
+     */
+    @TableField("endAddress")
+    private String endAddress;
     /**
      * 删除状态(1=否,2=是)
      */
@@ -129,11 +163,8 @@
         this.traveltime = traveltime;
     }
 
-    public Integer getCarTime() {
-        return carTime;
-    }
 
-    public void setCarTime(Integer carTime) {
+    public void setCarTime(double carTime) {
         this.carTime = carTime;
     }
 

--
Gitblit v1.7.1