From d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 18:02:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 2180888..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
@@ -25,6 +25,7 @@
      * @return 折线图数据
      */
     List<UserTrendsVO> userTrends(List<String> city);
+    List<UserTrendsVO> userTrends1(List<String> city,List<Integer> userIds);
 
     /**
      * 用户数据统计
@@ -33,4 +34,5 @@
      * @return 统计数据信息
      */
     UserDataCountVO userDataCount(UserDataCountRequest userDataCountRequest);
+    UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds,List<String> siteIds);
 }

--
Gitblit v1.7.1