From 79e82d188a24ad92395ac4b39c1a49266a647c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 04 十二月 2024 15:44:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index fb71383..f0a5e35 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -65,14 +65,11 @@
@ResponseBody
@PostMapping("/mobileLogin")
@ApiOperation(value = "手机号登录")
- public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
+ public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
return appUserService.mobileLogin(mobileLogin);
}
- @PostMapping("getAppUserById")
- AppUser getAppUserById(@RequestParam("id") Long id){
- return appUserService.getById(id);
- }
+
@@ -93,13 +90,10 @@
@ResponseBody
@PostMapping("/editAppUserById")
- public R<Void> editAppUserById(@RequestParam("appUser") AppUser appUser){
+ public R<Void> editAppUserById(@RequestParam("appUser") AppUser appUser) {
appUserService.updateById(appUser);
return R.ok();
- @PostMapping("/mobileLogin")
- @ApiOperation(value = "手机号登录")
- public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
- return appUserService.mobileLogin(mobileLogin);
+
}
@ResponseBody
@@ -112,7 +106,7 @@
@ResponseBody
@PostMapping("/getVipCount")
public R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId ){
- appUserService.lambdaQuery().eq(AppUser::getInviteUserId, userId).eq(AppUser::getVipId, vipId).count()
+ Long count = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, userId).eq(AppUser::getVipId, vipId).count();
return R.ok(count);
}
@@ -192,7 +186,7 @@
- @PostMapping("/index")
+ @GetMapping("/index")
@ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
public R<AppUser> index(){
System.err.println("=-====");
--
Gitblit v1.7.1