From 6408a348e14193b0f625673d4e4b22b9fbd1e369 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 八月 2025 18:10:15 +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 |    2 +-
 1 files changed, 1 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..e04f67c 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
@@ -55,7 +55,7 @@
      */
     private Integer userType;
     /**
-     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流,5=余额充值)
+     * 订单类型(1=专车,2=出租车,3=城际,4=小件物流,5=余额充值 6平台充值 7平台扣除)
      */
     private Integer orderType;
     /**

--
Gitblit v1.7.1