czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature

Browse Source 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
This commit is contained in:
wangw
2024-04-29 09:46:09 +08:00
parent d2388d56ea 963e311b60
commit ecae487993
16 changed files with 393 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eladmin-common/src/main/java/cn/ysk/cashier/utils/PageUtil.java
View File

@@ -15,6 +15,7 @@
*/
package cn.ysk.cashier.utils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.data.domain.Page;
import java.util.*;
@@ -49,8 +50,12 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
map.put("totalElements",page.getTotalElements());
return map;
}
public static Map<String,Object> toPlusPage(List<T> list, Integer total) {
Map<String,Object> map = new LinkedHashMap<>(2);
map.put("content",list);
map.put("totalElements",total);
return map;
}
/**
* 自定义分页
*/