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

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java

@@ -48,7 +48,7 @@
                Driver driver = driverService.selectById(uid);
                CarService query1 = carServiceMapper.query(3, driver.getCarId());
                if(query1 == null){
                    return ResultUtil.error("车辆未添加直通车服务");
                    return ResultUtil.error("车辆未添加跨城服务");
                }
            }
            query = new DriverOrders();