From 3fef2b68dc4e30eb9787c23c8154eb1d37e5a99e Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期日, 16 一月 2022 01:44:34 +0800 Subject: [PATCH] !129 重命名通用 数据权限 服务接口类名称,与其他服务接口风格统一 Merge pull request !129 from KonBAI/fix-rename-DataScopeService --- ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index af85c84..f1ff61a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.generator.domain.GenTable; @@ -46,8 +47,8 @@ @ApiOperation("鏌ヨ浠g爜鐢熸垚鍒楄〃") @SaCheckPermission("tool:gen:list") @GetMapping("/list") - public TableDataInfo<GenTable> genList(GenTable genTable) { - return genTableService.selectPageGenTableList(genTable); + public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) { + return genTableService.selectPageGenTableList(genTable, pageQuery); } /** @@ -73,8 +74,8 @@ @ApiOperation("鏌ヨ鏁版嵁搴撳垪琛�") @SaCheckPermission("tool:gen:list") @GetMapping("/db/list") - public TableDataInfo<GenTable> dataList(GenTable genTable) { - return genTableService.selectPageDbTableList(genTable); + public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) { + return genTableService.selectPageDbTableList(genTable, pageQuery); } /** -- Gitblit v1.9.3