Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunT...

Pu Zhibing

2026-01-12 6584fc650eb51e30ab185c7bff2439b4bcdc6186

 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{