From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/controller/LogUsualController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/LogUsualController.java b/src/main/java/org/springblade/modules/system/controller/LogUsualController.java
index 5898eed..a105677 100644
--- a/src/main/java/org/springblade/modules/system/controller/LogUsualController.java
+++ b/src/main/java/org/springblade/modules/system/controller/LogUsualController.java
@@ -60,8 +60,8 @@
* 查询多条(分页)
*/
@GetMapping("/list")
- public R<IPage<LogUsual>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
- IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogUsual.class));
+ public R<IPage<LogUsual>> list(@ApiIgnore LogUsual log, Query query) {
+ IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log));
return R.data(pages);
}
--
Gitblit v1.9.3