Commit 28c79d9e authored by 332784038@qq.com's avatar 332784038@qq.com

Merge branch 'master-fix'

parents 2bb309f0 c31fe01c
...@@ -731,7 +731,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -731,7 +731,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
orderTimeMapper.selectList( orderTimeMapper.selectList(
new LambdaQueryWrapper<OrderTimeDO>().eq(OrderTimeDO::getOrderId, orderId).orderByDesc(OrderTimeDO::getId)); new LambdaQueryWrapper<OrderTimeDO>().eq(OrderTimeDO::getOrderId, orderId).orderByDesc(OrderTimeDO::getId));
if (CollectionUtil.isNotEmpty(orderTimeList)) { if (CollectionUtil.isNotEmpty(orderTimeList)) {
getDaoCanTiam(orderTimeList); // getDaoCanTiam(orderTimeList);
dto.setOrderTimeVOList(OrderTimeConvert.INSTANCE.convertList( dto.setOrderTimeVOList(OrderTimeConvert.INSTANCE.convertList(
orderTimeList)); orderTimeList));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment