From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
index 59bcc47..2e804c8 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
@@ -53,7 +53,7 @@
}
@RequestMapping(value = "/pageMerMember", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取商户绑定会员列表")
+ @ApiOperation(value = "分页获取商户绑定会员列表【2.0】")
public R<Page<MerMemberPageVo>> pageMerMember(@RequestBody MerMemberPageDto merMemberPageDto) {
Long userId = SecurityUtils.getUserId();
Page<MerMemberPageVo> page = new Page<>();
@@ -106,7 +106,7 @@
@RequestMapping(value = "/addMerMember", method = RequestMethod.POST)
@ApiOperation(value = "新增会员")
- public R addMerMember(@RequestBody MerMemberAddDto merMemberAddDto) {
+ public R<Long> addMerMember(@RequestBody MerMemberAddDto merMemberAddDto) {
Long userId = SecurityUtils.getUserId();
merMemberAddDto.setUserId(userId);
memberService.addMerMember(merMemberAddDto);
--
Gitblit v1.7.1