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/crossCity/controller/LineController.java

@@ -95,7 +95,8 @@
    public ResultUtil<List<LineWarpper>> queryLines(Integer startId, Integer endId, Integer driverId){
        try {
            List<Map<String, Object>> list = lineService.queryLines(startId, endId, driverId);
            return ResultUtil.success(LineWarpper.getLineWarppers(list));
            List<LineWarpper> lineWarppers = LineWarpper.getLineWarppers(list);
            return ResultUtil.success(lineWarppers);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();