From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java
index 24738bf..a63c5dd 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java
@@ -26,6 +26,7 @@
* @return 折线图数据
*/
List<UserTrendsVO> userTrends(@Param("city") List<String> city);
+ List<UserTrendsVO> userTrends1(@Param("city") List<String> city,@Param("userIds") List<Integer> userIds);
/**
* 统计本年度，注册用户数量
@@ -34,6 +35,7 @@
* @return 注册用户数量
*/
Long increaseNumberByYear(@Param("cityList") List<String> cityList);
+ Long increaseNumberByYear1(@Param("cityList") List<String> cityList,@Param("userIds") List<Integer> userIds);
/**
* 统计本月，注册用户数量
@@ -42,4 +44,6 @@
* @return 注册用户数量
*/
Long increaseNumberByMonth(@Param("cityList") List<String> cityList);
+ Long increaseNumberByMonth1(@Param("cityList") List<String> cityList,@Param("userIds") List<Integer> userIds);
+
}
--
Gitblit v1.7.1