Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cash-api/order-server/src/main/resources/application.yml

cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java

@@ -2,6 +2,7 @@ package com.czg.utils;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.servlet.http.HttpServletRequest;
@@ -77,4 +78,17 @@ public class PageUtil {
         }
         return queryWrapper;
     }
+
+    /**
+     * pageHelper 转为 mybatisflex 分页
+     */
+    public static <T> Page<T> convert(PageInfo<T> page) {
+        Page<T> page1 = new Page<>();
+        page1.setPageNumber(page.getPageNum());
+        page1.setPageSize(page.getPageSize());
+        page1.setTotalRow(page.getTotal());
+        page1.setTotalPage(page.getPages());
+        page1.setRecords(page.getList());
+        return page1;
+    }
 }