Merge remote-tracking branch 'origin/dev' into dev

guyue

2025-08-18 b2be889ee9931b8ca97d77258466d75043b22786

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