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

3b0bba44 · 332784038@qq.com · da4a1023 · c31fe01c · 3b0bba44
Commit 3b0bba44 authored Aug 15, 2024 by 332784038@qq.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

OrderQueryServiceImpl.java ...odule/order/service/order/impl/OrderQueryServiceImpl.java +1 -1

No files found.
--- a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java
+++ b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java
@@ -731,7 +731,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                orderTimeMapper.selectList(
                        new LambdaQueryWrapper<OrderTimeDO>().eq(OrderTimeDO::getOrderId, orderId).orderByDesc(OrderTimeDO::getId));
        if (CollectionUtil.isNotEmpty(orderTimeList)) {
-            getDaoCanTiam(orderTimeList);
+//            getDaoCanTiam(orderTimeList);
            dto.setOrderTimeVOList(OrderTimeConvert.INSTANCE.convertList(
                    orderTimeList));
        }