From 21573e8e02dc47202ca3e1f7d4705795a09c1b60 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 09:11:36 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang 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 2e804c8..06a34fc 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
@@ -109,8 +109,8 @@
public R<Long> addMerMember(@RequestBody MerMemberAddDto merMemberAddDto) {
Long userId = SecurityUtils.getUserId();
merMemberAddDto.setUserId(userId);
- memberService.addMerMember(merMemberAddDto);
- return R.ok();
+ Long aLong = memberService.addMerMember(merMemberAddDto);
+ return R.ok(aLong);
}
@RequestMapping(value = "/editMerMember", method = RequestMethod.POST)
--
Gitblit v1.7.1