From 619a80228f7a26ce6e478770fb5884733b28f13c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 22 十二月 2021 10:22:00 +0800
Subject: [PATCH] update springboot 2.5.7 => 2.5.8 升级预防 log4j2 问题 update springboot-admin 2.5.4 => 2.5.5 update hutool 5.7.16 => 5.7.17
---
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 b90addf..685a5bb 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
@@ -5,6 +5,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("鏌ヨ浠ｇ爜鐢熸垚鍒楄〃")
@PreAuthorize("@ss.hasPermi('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("鏌ヨ鏁版嵁搴撳垪琛�")
@PreAuthorize("@ss.hasPermi('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