From 590f4e07af615abe48a502311161a1c982f3f4c3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 14 五月 2021 21:12:59 +0800
Subject: [PATCH] !34 同步dev分支 Merge pull request !34 from 疯狂的狮子li/dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 4d0d165..70e640e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -48,9 +48,7 @@
@GetMapping("/list")
public TableDataInfo list(SysRole role)
{
- startPage();
- List<SysRole> list = roleService.selectRoleList(role);
- return getDataTable(list);
+ return roleService.selectPageRoleList(role);
}
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
--
Gitblit v1.9.3