Merge remote-tracking branch 'origin/master'

liujie

8 天以前 7342170db7dc39326698d39b74e1858502fd574a

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -63,6 +63,9 @@
    })
    public ResultUtil<BaseWarpper> queryIdleDriver(Integer type, Double lon, Double lat){
        try {
            if(type==2){
                type=null;
            }
            List<Driver> list = driverService.queryIdleDriver(type, lon, lat, 5D, null);
            BaseWarpper baseWarpper = new BaseWarpper();
            baseWarpper.setNumber(list.size());