Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-08-27 3b054d0694de1a04c111f7adef089f264143cc8c

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java

@@ -66,8 +66,8 @@
            }

            @Override
            public R<Shop> getServiceProvider(Long appUserId) {
                return R.fail("获取服务商失败");
            public R<List<String>> getServiceProvider(Long appUserId) {
                return R.fail("获取用户店铺失败");
            }

            @Override