合并代码

puzhibing

2024-12-11 ff2ef0cfdaf6c2217c728d4c7cd91ea47e1f3ac9

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

@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserCoupon;
@@ -327,5 +328,20 @@
      return R.ok();
   }

   /**
    * 获取用户列表
    */
   @GetMapping("/getAppuserPage")
   @ApiOperation(value = "用户列表", tags = {"后台管理"})
   public R<IPage<AppUser>> getAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
                          @ApiParam("每一页数据大小") Integer pageSize,
                          AppUser appUser)
   {
      IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser);
      return R.ok(appuserPage);
   }



}