From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 五月 2024 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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..36823c3 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,7 +44,7 @@
* 用车时长
*/
@TableField("carTime")
- private Integer carTime;
+ private double carTime;
/**
* 车型
*/
@@ -78,6 +80,34 @@
*/
@TableField("remark")
private String remark;
+
+ @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,9 +159,6 @@
this.traveltime = traveltime;
}
- public Integer getCarTime() {
- return carTime;
- }
public void setCarTime(Integer carTime) {
this.carTime = carTime;
--
Gitblit v1.7.1