Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2

 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);
}