From 830bdcba8910f80221fc9a8488496970228cedb0 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 10 一月 2025 14:15:50 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java index f44de38..2d65105 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java @@ -34,5 +34,5 @@ * @return 统计数据信息 */ UserDataCountVO userDataCount(UserDataCountRequest userDataCountRequest); - UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds); + UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds,List<String> siteIds); } -- Gitblit v1.7.1