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

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java

@@ -249,7 +249,7 @@
     */
    ResultUtil<BaseWarpper> saveOrderFerry(String serverCarModelIds, Date travelTime, String placementLon, String placementLat, String startLon,
                                           String startLat, String startAddress, String endLon, String endLat, String endAddress,
                                           Integer crossCityOrderId, Integer place, Integer orderSource, Integer uid) throws Exception;
                                           Integer crossCityOrderId, Integer place, Integer orderSource, Integer uid,String name ,String phone) throws Exception;