Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-21 f6f4e7beea525f0c450d618fdc93f112c6813edc

 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);