Merge remote-tracking branch 'origin/master'

xuhy

2025-06-26 3dc3bdfbdcdb73ca68ee520bf6a9558c51f32fb3

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java

@@ -56,5 +56,5 @@
                                                         @Param("paymentTimeEnd") String paymentTimeEnd,@Param("orderType") Integer orderType);



    Map<String,Object> getTaxiOrderDetailById(@Param("orderId") Integer orderId);
}