From e52227b01983146f2e3c81dc575141d8b9889497 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 10:16:30 +0800
Subject: [PATCH] 代码调整

---
 DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java |   35 +++++++++++++----------------------
 1 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
index eaa8a9c..2d15a60 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -179,9 +179,6 @@
      */
     @TableField("tipMoney")
     private Double tipMoney;
-    //节假日费
-    @TableField("holidayFee")
-    private Double holidayFee;
     /**
      * 红包抵扣金额
      */
@@ -227,9 +224,6 @@
      */
     @TableField("payMoney")
     private Double payMoney;
-    //感谢费
-    @TableField("thankYouFee")
-    private Double thankYouFee;
     /**
      * 是否是代下单(0:否,1:是)
      */
@@ -295,6 +289,11 @@
      */
     @TableField("orderSource")
     private Integer orderSource;
+    /**
+     * 设备号
+     */
+    @TableField("deviceCode")
+    private String deviceCode;
     /**
      * 发票id
      */
@@ -597,14 +596,6 @@
         this.tipMoney = tipMoney;
     }
 
-    public Double getHolidayFee() {
-        return holidayFee;
-    }
-
-    public void setHolidayFee(Double holidayFee) {
-        this.holidayFee = holidayFee;
-    }
-
     public Double getRedPacketMoney() {
         return redPacketMoney;
     }
@@ -651,14 +642,6 @@
 
     public void setPayMoney(Double payMoney) {
         this.payMoney = payMoney;
-    }
-
-    public Double getThankYouFee() {
-        return thankYouFee;
-    }
-
-    public void setThankYouFee(Double thankYouFee) {
-        this.thankYouFee = thankYouFee;
     }
 
     public Integer getSubstitute() {
@@ -862,6 +845,14 @@
         this.bindId = bindId;
     }
 
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
     @Override
     public String toString() {
         return "OrderTaxi{" +

--
Gitblit v1.7.1