Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

Pu Zhibing

2025-01-16 3c923d976c45df37ea752153e12107a3a29437e1

 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查询订单失败");
            }
        };