From 65ca63cc3d36f23d285a7d944fcc0d6bac92430d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 14:41:42 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderGoodsMapper.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderGoodsMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderGoodsMapper.java
index 7d714db..011c397 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderGoodsMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderGoodsMapper.java
@@ -3,6 +3,7 @@
 import com.ruoyi.order.domain.pojo.order.OrderGoods;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.order.domain.vo.AppUserOrderGoodsPageVo;
+import com.ruoyi.order.domain.vo.MgtOrderGoodsDetailVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -22,6 +23,15 @@
      * @param orderId
      * @return
      */
-    List<AppUserOrderGoodsPageVo> listVoByOrderId(@Param("orderId") String orderId);
+    List<AppUserOrderGoodsPageVo> listAppVoByOrderId(@Param("orderId") String orderId);
+
+    /**
+     * @description  平台通过id获取VO
+     * @author  jqs
+     * @date    2023/6/16 16:53
+     * @param orderId
+     * @return  List<MgtOrderGoodsDetailVo>
+     */
+    List<MgtOrderGoodsDetailVo> listMgtVoByOrderId(@Param("orderId")String orderId);
 
 }

--
Gitblit v1.7.1