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
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java
index 2ff78a0..512a957 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java
@@ -1,8 +1,12 @@
package com.stylefeng.guns.modular.system.model;
+import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.DataSource;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
import java.io.Serializable;
/**
@@ -14,6 +18,7 @@
* @since 2020-09-24
*/
@TableName("t_order_chartered_car")
+@Data
public class TOrderCharteredCar extends Model<TOrderCharteredCar> {
private static final long serialVersionUID = 1L;
@@ -31,6 +36,8 @@
* 订单编号
*/
private String orderNumber;
+
+ private Integer serviceId;
/**
* 出行时间
*/
@@ -38,7 +45,8 @@
/**
* 用车时长（天）
*/
- private Integer carTime;
+ private BigDecimal carTime;
+
/**
* 服务车型id
*/
@@ -67,6 +75,7 @@
* 处理备注
*/
private String remark;
+ private String newRemark;
/**
* 删除状态（1=否，2=是）
*/
@@ -117,11 +126,11 @@
this.traveltime = traveltime;
}
- public Integer getCarTime() {
+ public BigDecimal getCarTime() {
return carTime;
}
- public void setCarTime(Integer carTime) {
+ public void setCarTime(BigDecimal carTime) {
this.carTime = carTime;
}
--
Gitblit v1.7.1