Merge remote-tracking branch 'origin/master'

luodangjia

2025-02-08 69f4e7bafd3d81696aa00affd6b9ddfa6b50503f

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

@@ -30,7 +30,7 @@
         }

         @Override
         public R<List<ShopBalanceStatement>> getShopBalanceStatementList2(Integer type, LocalDateTime date) {
         public R<List<ShopBalanceStatement>> getShopBalanceStatementList2(Integer type, Integer shopId, LocalDateTime date) {
            return R.fail();
         }
      };