Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-05 aedbc07847148107a67ecab405ce66a2f6ed549d

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

@@ -24,6 +24,11 @@
         public R<List<Goods>> getGoodsByType(Integer type) {
            return R.fail("根据类型（1=服务商品，2=单品商品）获取商品数据失败：" + cause.getMessage());
         }
			
         @Override
         public R<Goods> getGoodsById(Integer id) {
            return R.fail("根据id获取商品详情失败：" + cause.getMessage());
         }
      };
   }
}