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/server/impl/LineSiteServiceImpl.java

@@ -137,11 +137,17 @@
                    map.put("price", jsonObject.getString("num1"));
                    data = map;
                    list.add(data);
                    if (lineShift.getStartTime().equals(lineShift.getEndTime())){
                        data.put("startTime",lineShift.getStartTime());
                    }
                }
            }
            if(b){
                data.put("id", lineShift.getId());
                data.put("startTime", lineShift.getStartTime());
                data.put("startTime", lineShift.getStartTime()+"-"+lineShift.getEndTime());
                if (lineShift.getStartTime().equals(lineShift.getEndTime())){
                    data.put("startTime",lineShift.getStartTime());
                }
                list.add(data);
            }
        }