Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-21 f6f4e7beea525f0c450d618fdc93f112c6813edc

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/OrderTaxiMapper.java

@@ -52,7 +52,7 @@
     * @param orderId
     * @return
     */
    Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId);
    Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId, @Param("openCityId") Integer openCityId);


    /**