From 50df16e1a5b28e7fc9055a428c9be88d3f043326 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 19:11:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 meiya-rest/src/main/java/com/sinata/rest/modular/mall/dao/MallOrderMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/dao/MallOrderMapper.java b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/dao/MallOrderMapper.java
index 030818f..6641725 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/dao/MallOrderMapper.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/dao/MallOrderMapper.java
@@ -28,7 +28,7 @@
      */
     List<VoMallOrder> getOrderByUserIdList(@Param("userId") Integer userId, @Param("saleUserId") Integer saleUserId, @Param("stateArray") Object[] stateArray);
     List<VoMallOrder> getOrderByUserIdList(@Param("userId") Integer userId, @Param("saleUserId") Integer saleUserId, @Param("state")Integer state, @Param("page") Page page);
-    VoMallOrder getOrderByOrderNo(@Param("orderNo") String orderNo);
+    List<VoMallOrder> getOrderListByOrderNo(@Param("orderNo") String orderNo);
     /**
      * 获取用户详细订单列表
      */

--
Gitblit v1.7.1