Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-18 866f686c3c4ae1bd47affe146a26db5dd1ceb032

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -503,6 +503,16 @@
        appUserService.updateById(byId);
        return R.ok();
    }
    @GetMapping("/change/shop")
    @ApiOperation(value = "用户列表-更换门店", tags = {"管理后台"})
    public R<AppUser> shop(Long id,Long shopId)
    {
        AppUser byId = appUserService.getById(id);
        byId.setShopId(shopId);
        appUserService.updateById(byId);
        return R.ok();
    }


    public  Long getTop(Long inviteId){
        AppUser byId = appUserService.getById(inviteId);

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserChangeLogController.java

@@ -7,6 +7,7 @@
import com.ruoyi.account.dto.UserChangeQuery;
import com.ruoyi.account.service.UserChangeLogService;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,6 +43,7 @@
    }

    @PostMapping("/page")
    @ApiOperation(value = "会员变更记录", tags = {"后台"})
    public R<IPage<UserChangeLog>> page(@RequestBody UserChangeQuery userChangeLog){

        return R.ok(userChangeLogService.pageList(userChangeLog));