shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-04-07 16:00:27 +08:00
parent 9a6625905a
commit 5bb1bc6b43
6 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
View File

@@ -21,7 +21,7 @@ public interface UserService extends IService<User> {
User getByUsername(String username);
Page<UserAdminVo> pageAdmin(PageQuery pageQuery, User query);
Page<UserAdminVo> pageAdmin(PageQuery pageQuery, UserAdminVo query);
Page<UserListVo> pageApp(PageQuery page, UserQuery query);
Page<UserListVo> greetPageApp(PageQuery page, GreetQuery query);

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
View File

@@ -96,7 +96,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
}
@Override
public Page<UserAdminVo> pageAdmin(PageQuery pageQuery, User query) {
public Page<UserAdminVo> pageAdmin(PageQuery pageQuery, UserAdminVo query) {
return baseMapper.pageAdmin(pageQuery.build(),query);
}