Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 7809665d by chamberone
Options

Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… 

…oject.git into develop
2 parents effb0bda e63273c7
Inline Side-by-side
Showing with 5 additions and 5 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/RoleController.java
......@@ -21,9 +21,9 @@ public class RoleController {
IRole roleService;
@GetMapping("/list")
public Result<PageResult<RoleInfo>> listRole(PageRequest pageRequest) {
WebResult<PageResult<RoleInfo>> result = roleService.listRole(pageRequest);
return Result.success(result.getResult());
}
// @GetMapping("/list")
// public Result<PageResult<RoleInfo>> listRole(PageRequest pageRequest) {
// WebResult<PageResult<RoleInfo>> result = roleService.listRole(pageRequest);
// return Result.success(result.getResult());
// }
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!