Merge branch 'ww' into test

2024-10-14 14:56:57 +08:00
parent 1cc7188488 5468fa56de
commit bf5e5ec7dd
2 changed files with 2 additions and 2 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
@@ -91,7 +91,7 @@ public class TbShopCategoryServiceImpl implements TbShopCategoryService {
                .filter(d -> d.getTree()==null || d.getId().equals(d.getTree()))
                .collect(Collectors.toList());

-        return PageUtil.toPage(result, page.getTotalElements()-children.size());
+        return PageUtil.toPage(result, page.getTotalElements());
    }

 //    @Override