From f19155dcda0413563963d545eed3045364814c0d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 12 八月 2023 05:14:27 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
index b44c461..fba7330 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
@@ -4,6 +4,10 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.order.domain.dto.*;
 import com.ruoyi.order.domain.pojo.order.Order;
+import com.ruoyi.order.domain.vo.MerMemberNoClearOrderVo;
+import com.ruoyi.order.domain.vo.MerOrderPageVo;
+import com.ruoyi.order.domain.vo.MerOrderTotalVo;
+import com.ruoyi.order.domain.vo.MerTotalOrderVo;
 import com.ruoyi.order.domain.vo.*;
 import com.ruoyi.system.api.domain.dto.*;
 import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
@@ -39,7 +43,7 @@
      * @param userId
      * @return
      */
-    List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page,  @Param("userId") Long userId);
+    List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("userId") Long userId);
 
 
 
@@ -48,7 +52,7 @@
      * @param merOrderPageDto
      * @return
      */
-    List<MerOrderPageVo> pageMerOrder(Page page,@Param("param") MerOrderPageDto merOrderPageDto);
+    List<MerOrderPageVo> pageMerOrder(Page page, @Param("param") MerOrderPageDto merOrderPageDto);
 
 
     /**
@@ -57,7 +61,7 @@
      * @param userId
      * @return
      */
-    List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page,  @Param("userId") Long userId);
+    List<MerMemberOrderVo> pageMerMemberOrder(Page page,  @Param("userId") Long userId);
 
     /**
      * 获取用户订单统计

--
Gitblit v1.7.1