From 996acccd51e8fd31a26d92b012e34b6fbbcf2237 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 14:40:59 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Utility/Extension/SqlSugarPagedExtensions.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Wms/Utility/Extension/SqlSugarPagedExtensions.cs b/Wms/Utility/Extension/SqlSugarPagedExtensions.cs
index 697f375..1528e27 100644
--- a/Wms/Utility/Extension/SqlSugarPagedExtensions.cs
+++ b/Wms/Utility/Extension/SqlSugarPagedExtensions.cs
@@ -6,7 +6,7 @@
namespace Utility
{
- public class SqlSugarPagedList<TEntity> where TEntity : new()
+ public class SqlSugarPagedList
{
/// <summary>
/// 鎬绘潯鏁�
@@ -21,7 +21,7 @@
/// <summary>
/// 褰撳墠椤甸泦鍚�
/// </summary>
- public IEnumerable<TEntity> Items { get; set; }
+ public object Items { get; set; }
}
/// <summary>
/// 鍒嗛〉鎷撳睍绫�
@@ -35,13 +35,13 @@
/// <param name="pageIndex">褰撳墠椤电爜锛屼粠1寮�濮�</param>
/// <param name="pageSize">椤电爜瀹归噺</param>
/// <returns></returns>
- public static async Task<SqlSugarPagedList<TEntity>> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> query, int pageIndex, int pageSize)
+ public static async Task<SqlSugarPagedList> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> query, int pageIndex, int pageSize)
where TEntity : new()
{
RefAsync<int> total = 0;
var items = await query.ToPageListAsync(pageIndex, pageSize, total);
var totalPages = pageSize > 0 ? (int)Math.Ceiling(total / (double)pageSize) : 0;
- return new SqlSugarPagedList<TEntity>
+ return new SqlSugarPagedList
{
Items = items,
Total = total,
--
Gitblit v1.8.0