From e345b36025818615eb68d37819eaff312d1fb986 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 12:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
index e210482..2914fc6 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
@@ -273,6 +273,9 @@
                             case 2:
                                 historyVo.setState("订单收入");
                                 break;
+                            case 3:
+                                historyVo.setState("城际出行");
+                                break;
                             default:
                                 historyVo.setState("充值");
                                 break;
@@ -311,6 +314,9 @@
                         case 2:
                             historyVo.setState("订单收入");
                             break;
+                        case 3:
+                            historyVo.setState("城际出行");
+                            break;
                         default:
                             historyVo.setState("充值");
                             break;

--
Gitblit v1.7.1