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

无关风月

2025-08-27 b8abd1c4081c2c67c1f258b9956f4c60652d831d

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

@@ -19,7 +19,7 @@
   public GoodsShopClient create(Throwable cause) {
      return new GoodsShopClient() {
         @Override
         public R<GoodsShop> getGoodsShop(GoodsShop goodsShop) {
         public R<GoodsShop> getGoodsShop(Integer goodsId) {
            return R.fail("获取商品门店关系数据失败：" + cause.getMessage());
         }