From f39e7de8be43eda95560f49982b6cd0345e24404 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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