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

guyue

2025-08-18 b2be889ee9931b8ca97d77258466d75043b22786

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCrossCityServiceImpl.java

@@ -75,4 +75,9 @@
        }
        return this.baseMapper.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTimeStart, createTimeEnd, paymentTimeStart, paymentTimeEnd,orderType);
    }

    @Override
    public Map<String, Object> getTaxiOrderDetailById(Integer orderId) {
        return this.baseMapper.getTaxiOrderDetailById(orderId);
    }
}