Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-18 3f8e43bb394301b7018a03d2d38e70e1232443d6

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

@@ -1,6 +1,7 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.vo.OrderPageList;
import com.ruoyi.order.vo.OrderPageListVo;
import com.ruoyi.order.vo.OrderVO;
@@ -29,5 +30,5 @@
     * @param orderPageList
     * @return
     */
    List<OrderPageListVo> getOrderPageList(@Param("item") OrderPageList orderPageList);
    List<OrderPageListVo> getOrderPageList(PageInfo<OrderPageListVo> pageInfo,  @Param("item") OrderPageList orderPageList);
}