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

无关风月

5 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/WithdrawFallbackFactory.java

@@ -25,7 +25,7 @@
            }

            @Override
            public R<Page<UserWithdrawRecordVO>> withdrawPage1(List<String> cityList, String nickname, String userPhone, String applyForTime, Integer state, Integer pageNum, Integer pageSize, List<Integer> userIds) {
            public R<Page<UserWithdrawRecordVO>> withdrawPage1(List<String> cityList, String nickname, String userPhone, String applyForTime, Integer state, Integer pageNum, Integer pageSize, List<Integer> userIds,List<String> siteIds) {
                return R.fail(cause.getMessage());
            }

@@ -75,7 +75,7 @@
            }

            @Override
            public R<Page<UserWithdrawRecordVO>> withdrawList1(List<String> cityList, Integer userId, Integer pageNum, Integer pageSize) {
            public R<Page<UserWithdrawRecordVO>> withdrawList1(List<String> cityList, Integer userId, Integer pageNum, Integer pageSize,List<String> siteIds) {
                return R.fail(cause.getMessage());
            }

@@ -104,6 +104,11 @@
            public R<WithdrawDetailVO> withdrawDetailByUser(String orderId) {
                return R.fail(cause.getMessage());
            }

            @Override
            public R<String> confirmMoney(String id) {
                return null;
            }
        };
    }
}