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 |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 28d2628..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
@@ -3,7 +3,10 @@
 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;
 
 /**
@@ -15,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;
@@ -32,6 +36,8 @@
      * 订单编号
      */
     private String orderNumber;
+
+    private Integer serviceId;
     /**
      * 出行时间
      */
@@ -40,6 +46,7 @@
      * 用车时长(天)
      */
     private BigDecimal carTime;
+
     /**
      * 服务车型id
      */
@@ -68,6 +75,7 @@
      * 处理备注
      */
     private String remark;
+    private String newRemark;
     /**
      * 删除状态(1=否,2=是)
      */

--
Gitblit v1.7.1