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/api/UserApi.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 9394a5a..09a90c4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -246,7 +246,7 @@
* @return 人员详情
*/
@PostMapping("detailuser")
- public R detailUser(@RequestParam("userId") Long userId) {
+ public R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId) {
return userService.detailUser(userId);
}
@@ -631,8 +631,8 @@
* @return 运营后台数据看板
*/
@PostMapping("datakanban")
- public R dataKanban() {
- return userService.dataKanban();
+ public R dataKanban(@RequestParam("areaCode")String areaCode) {
+ return userService.dataKanban(areaCode);
}
/**
@@ -1221,13 +1221,13 @@
* @return 用户数据统计汇总
*/
@GetMapping("community/statistics")
- public R communityStatistics() {
- return userService.communityStatistics();
+ public R communityStatistics(@RequestParam("areaCode") String areaCode) {
+ return userService.communityStatistics(areaCode);
}
@GetMapping("community/statistics/export")
- public R communityStatisticsExport() {
- return userService.communityStatisticsExport();
+ public R communityStatisticsExport(@RequestParam("areaCode") String areaCode) {
+ return userService.communityStatisticsExport(areaCode);
}
/**
@@ -1319,4 +1319,5 @@
public R bindOrAddMcsUser(@RequestBody BindUserPhoneDTO bindUserPhoneDTO) {
return userService.bindOrAddMcsUser(bindUserPhoneDTO);
}
+
}
--
Gitblit v1.7.1