From 657d9812259a5c100b2afb71a9eae1769d9432cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 29 八月 2024 15:38:50 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
index ae5925d..4615b05 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -35,7 +36,7 @@
* @param query
* @return
*/
- List<MyShoppingOrderList> getMyShoppingOrderList(GetMyShoppingOrderList query);
+ Map<String, Object> getMyShoppingOrderList(GetMyShoppingOrderList query);
/**
--
Gitblit v1.7.1