Commit 811149ff authored by zhengyi's avatar zhengyi

Merge branch 'master-fix' into release

parents 26e466b4 530a211b
...@@ -242,5 +242,5 @@ public interface OrderItemMapper extends AbstractMapper<OrderItemDO> { ...@@ -242,5 +242,5 @@ public interface OrderItemMapper extends AbstractMapper<OrderItemDO> {
"<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>#{item}</foreach>", "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>#{item}</foreach>",
"</script>" "</script>"
}) })
List<OrderItemDO> getWarehouseInOrderItemListByOrderIds(List<Long> orderIdList); List<OrderItemDO> getWarehouseInOrderItemListByOrderIds(@Param("lang") Integer lang, List<Long> orderIdList);
} }
...@@ -235,6 +235,6 @@ public class OrderItemServiceImpl extends AbstractService<OrderItemMapper, Order ...@@ -235,6 +235,6 @@ public class OrderItemServiceImpl extends AbstractService<OrderItemMapper, Order
@Override @Override
public List<OrderItemDO> getWarehouseInOrderItemListByOrderIds(List<Long> orderIdList) { public List<OrderItemDO> getWarehouseInOrderItemListByOrderIds(List<Long> orderIdList) {
return orderItemMapper.getWarehouseInOrderItemListByOrderIds(orderIdList); return orderItemMapper.getWarehouseInOrderItemListByOrderIds(I18nMessage.getLang(), orderIdList);
} }
} }
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