From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 36823c3..92dbfeb 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
@@ -50,6 +50,9 @@
*/
@TableField("serverCarModelId")
private Integer serverCarModelId;
+
+ @TableField("serviceId")
+ private Integer serviceId;
/**
* 车型用途
*/
@@ -80,6 +83,8 @@
*/
@TableField("remark")
private String remark;
+ @TableField("newRemark")
+ private String newRemark;
@TableField("startLon")
private Double startLon;
@@ -160,7 +165,7 @@
}
- public void setCarTime(Integer carTime) {
+ public void setCarTime(double carTime) {
this.carTime = carTime;
}
--
Gitblit v1.7.1