From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java
index 649f4ae..1ecfc03 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java
@@ -33,19 +33,17 @@
@RequestMapping(value = "/getTotalMemberTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户会员人数统计")
+ @ApiOperation(value = "获取商户会员人数统计(商户管理-统计经营-会员统计)")
public R<MgtTotalMemberTotalVo> getTotalMemberTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
Long userId = SecurityUtils.getUserId();
- mgtBaseShopDto.setUserId(userId);
MgtTotalMemberTotalVo totalMemberTotalVo = memberService.getTotalMemberTotal(mgtBaseShopDto);
return R.ok(totalMemberTotalVo);
}
@RequestMapping(value = "/getPlTotalMemberTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取平台会员人数统计")
+ @ApiOperation(value = "获取平台会员人数统计(统计-会员统计)")
public R<MgtPlTotalMemberTotalVo> getPlTotalMemberTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
Long userId = SecurityUtils.getUserId();
- mgtBasePlatformDto.setUserId(userId);
MgtPlTotalMemberTotalVo plTotalMemberTotal = memberService.getPlTotalMemberTotal(mgtBasePlatformDto);
return R.ok(plTotalMemberTotal);
}
--
Gitblit v1.7.1