Merge remote-tracking branch 'origin/dev' into dev

xuhy

6 小时以前 3b6789ae8cb8138533b2cc362f37ad94b605a58d

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java

@@ -62,4 +62,6 @@
    List<BaseWarpper> queryBusiness(Integer uid) throws Exception;

    List<Driver> queryDriverLimitTen(Integer type, Double lon, Double lat);

    List<Driver> queryIdleDriver_(Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId);
}