From 6584fc650eb51e30ab185c7bff2439b4bcdc6186 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 12 一月 2026 17:07:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong into dev

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index dd03c5e..a3f6ccb 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -2501,6 +2501,7 @@
         shellList.add("所属分公司");
         shellList.add("所属加盟商");
         shellList.add("当前车辆");
+        shellList.add("当前绑定车辆");
         shellList.add("服务模式");
         shellList.add("关联线路");
         shellList.add("评分");
@@ -2556,6 +2557,11 @@
             }else{
                 shellList.add("-");
             }
+            if(SinataUtil.isNotEmpty(object.get("carName"))){
+                shellList.add(object.get("carName").toString());
+            }else{
+                shellList.add("-");
+            }
             if(SinataUtil.isNotEmpty(object.get("serverStr"))){
                 shellList.add(object.get("serverStr").toString());
             }else{

--
Gitblit v1.7.1