From 597e90b77d49872baf19e03524be9b43444fa64f Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 30 八月 2024 10:22:49 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- 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