Merge remote-tracking branch 'origin/master'

zhanglin8526

2023-05-09 c2d38efe0c2516295abb968442ef765e3da9544d

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java

@@ -115,4 +115,12 @@
     */
    List<MerOrderPageVo> pageMerOrder(Page page,MerOrderPageDto merOrderPageDto);

    /**
     *
     * @param page
     * @param merMemberNoClearOrderDto
     * @return
     */
    List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);

}