lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-06-24 03:20:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/generate

Browse Source 
# Conflicts:
#	server/like-common/src/main/java/com/hxkj/common/core/PageResult.java
This commit is contained in:
TinyAnts
2022-06-09 18:28:16 +08:00
parent bad1ebf54c 648d9e1c1f
commit af2f416cd6
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/like-common/src/main/java/com/hxkj/common/core/PageResult.java
View File

@@ -55,12 +55,12 @@ public class PageResult<T> {
* @param <T> 实体类型
* @return PageList
*/
public static <T> PageResult<T> iPageHandle(Long total, Long pageNo, Long size, List<T> lists) {
public static <T> PageResult<T> iPageHandle(Long total, Long pageNo, Long size, List<T> list) {
PageResult<T> pageResult = new PageResult<>();
pageResult.setCount(total);
pageResult.setPageNo(Math.toIntExact(pageNo));
pageResult.setPageSize(Math.toIntExact(size));
pageResult.setLists(lists);
pageResult.setLists(list);
return pageResult;
}