From c08e13eb2c875a160b3f30acaa6d01306c19b444 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 17 一月 2025 17:59:36 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java index 4c2bf1a..f2659f8 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java @@ -63,7 +63,7 @@ return R.fail(); } @Override - public R<List<Order>> byShopIdAndUserId(Integer shopId,Long userId) { + public R<List<Order>> byShopIdAndUserId(Long userId,Integer shopId) { return R.fail("通过门店和用户id查询订单失败"); } }; -- Gitblit v1.7.1