From 1748ac45ea7e9b67728a515cd7ede095b980a9ef Mon Sep 17 00:00:00 2001
From: Lemon <1730392988@qq.com>
Date: Thu, 22 Jul 2021 17:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../time/store/order/controller/OrderShipmentController.java    | 2 +-
 .../java/com/time/store/order/mapper/OrderShipmentMapper.java   | 2 +-
 .../java/com/time/store/order/service/OrderShipmentService.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/time/store/order/controller/OrderShipmentController.java b/src/main/java/com/time/store/order/controller/OrderShipmentController.java
index 38f7b30..3f98f80 100644
--- a/src/main/java/com/time/store/order/controller/OrderShipmentController.java
+++ b/src/main/java/com/time/store/order/controller/OrderShipmentController.java
@@ -40,7 +40,7 @@ public class OrderShipmentController {
      * @status done
      */
     @GetMapping("page")
-    public Page<OrderShipmentPageReq> page(@Validated OrderShipmentPageReq orderShipmentPageReq) {
+    public Page<OrderShipment> page(@Validated OrderShipmentPageReq orderShipmentPageReq) {
         return orderShipmentService.pageOrderShipment(orderShipmentPageReq);
     }
     /**
diff --git a/src/main/java/com/time/store/order/mapper/OrderShipmentMapper.java b/src/main/java/com/time/store/order/mapper/OrderShipmentMapper.java
index 1395640..6258c35 100644
--- a/src/main/java/com/time/store/order/mapper/OrderShipmentMapper.java
+++ b/src/main/java/com/time/store/order/mapper/OrderShipmentMapper.java
@@ -14,5 +14,5 @@ public interface OrderShipmentMapper extends BaseMapper<OrderShipment> {
      * @param orderShipmentPageReq
      * @return
      */
-    Page<OrderShipmentPageReq> pageOrderShipment(@Param("orderShipmentPageReq") OrderShipmentPageReq orderShipmentPageReq,@Param("page") Page<OrderShipmentPageReq> page);
+    Page<OrderShipment> pageOrderShipment(@Param("orderShipmentPageReq") OrderShipmentPageReq orderShipmentPageReq,@Param("page") Page<OrderShipmentPageReq> page);
 }
diff --git a/src/main/java/com/time/store/order/service/OrderShipmentService.java b/src/main/java/com/time/store/order/service/OrderShipmentService.java
index 305ef92..062767e 100644
--- a/src/main/java/com/time/store/order/service/OrderShipmentService.java
+++ b/src/main/java/com/time/store/order/service/OrderShipmentService.java
@@ -48,7 +48,7 @@ public class OrderShipmentService extends ServiceImpl<OrderShipmentMapper, Order
      * @param orderShipmentPageReq
      * @return
      */
-    public Page<OrderShipmentPageReq> pageOrderShipment(OrderShipmentPageReq orderShipmentPageReq) {
+    public Page<OrderShipment> pageOrderShipment(OrderShipmentPageReq orderShipmentPageReq) {
         Page<OrderShipmentPageReq> page = new Page<>();
         page.setCurrent(orderShipmentPageReq.getCurrent());
         page.setSize(orderShipmentPageReq.getSize());
-- 
Gitee