From db67d2c23022fed302b8cb07f03076b07ab0941b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 11:16:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index cd6f1c3..caa39f5 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -197,7 +197,7 @@
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");
- int num=IUserService.selectNum("3",keyword,null);
+ int num=IUserService.selectNum("3",keyword,null,"1");
return getDataTable(list,num);
}
--
Gitblit v1.7.1