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

Pu Zhibing

昨天 bf2acefcf5ba801d3e4a4f507c5f064fc93625cc

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java

@@ -51,7 +51,7 @@
                                             @Param("state") Integer state,
                                             @Param("lon") String lon,
                                             @Param("lat") String lat);
    Map<String, Object> queryOrderInfo2(@Param("orderId") Integer orderId);
    Map<String, Object> queryOrderInfo2(@Param("orderId") Integer orderId, @Param("openCityId") Integer openCityId);