From f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 九月 2025 12:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java
index 90b830b..8d59fe2 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java
@@ -1,5 +1,6 @@
 package com.stylefeng.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.IdType;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -55,14 +56,26 @@
      */
     private Integer userType;
     /**
-     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流,5=余额充值)
+     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流,5=余额充值 6平台充值 7平台扣除)
      */
     private Integer orderType;
     /**
      * 订单id
      */
     private Integer orderId;
+    /**
+     * 司机余额
+     */
+    @TableField("driverBalance")
+    private Double driverBalance;
 
+    public Double getDriverBalance() {
+        return driverBalance;
+    }
+
+    public void setDriverBalance(Double driverBalance) {
+        this.driverBalance = driverBalance;
+    }
 
     public Integer getId() {
         return id;

--
Gitblit v1.7.1