From 5a278a0965b417e7f39e8c209e2ff401f415066a Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期一, 21 二月 2022 14:07:48 +0800 Subject: [PATCH] Merge branch 'hemenkou_dev' into dev --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java index dc3881c..612b697 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java @@ -157,7 +157,7 @@ * 用户id * @return 人员详情 */ - R detailUser(Long userId); + R<LoginUserInfoVO> detailUser(Long userId); /** * 设置用户标签 @@ -416,7 +416,7 @@ * * @return 展示数据 */ - R dataKanban(); + R dataKanban(String areaCode); /** * 社区管理后台数据看板 @@ -748,9 +748,9 @@ * 运营后台-用户数据统计汇总 * @return 用户数据统计汇总 */ - R communityStatistics(); + R communityStatistics(String areaCode); - R communityStatisticsExport(); + R communityStatisticsExport(String areaCode); /** * 通过UnionId获取用户信息 -- Gitblit v1.7.1