From 09394848ce262aff81897503d32ec334fd3f2b6f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 15:59:30 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan
---
src/main/java/com/ruoyi/account/controller/AccountController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountController.java b/src/main/java/com/ruoyi/account/controller/AccountController.java
index 50f1b60..2f9690b 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountController.java
@@ -74,8 +74,8 @@
*/
@GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult accountListPage(Page page) {
- return AjaxResult.success(accountService.page(page));
+ public AjaxResult accountListPage(Page page,Account account) {
+ return AjaxResult.success(accountService.accountListPage(page,account));
}
--
Gitblit v1.9.3