From 22106718c5845ccd8fa2328d39b28f88e9761e91 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 五月 2024 14:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java |    7 ++++---
 1 files changed, 4 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..28d2628 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,5 +1,6 @@
 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.TableName;
@@ -38,7 +39,7 @@
     /**
      * 用车时长(天)
      */
-    private Integer carTime;
+    private BigDecimal carTime;
     /**
      * 服务车型id
      */
@@ -117,11 +118,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