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

puzhibing

2025-01-15 edd2c4d20cdfde142275f88b2f79ea8a8778bf78

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