From 4bcf8051886a6666d8209e43eb20a184d091824e Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 09:29:46 +0800
Subject: [PATCH] Merge commit 'e41ec4ec32db3c3476489dd39cd7a972280aa636' 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 764bbb4..cd6f1c3 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
@@ -195,7 +195,7 @@
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");
int num=IUserService.selectNum("3",keyword,null);
return getDataTable(list,num);
--
Gitblit v1.7.1