From 6d5c3dee0d97798f70bf965e48c3a782b3df9e7d Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 10 七月 2024 10:48:25 +0800
Subject: [PATCH] Merge branch 'hwh' into Liudl

---
 Wms/WMS.IDAL/IBaseRepository.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Wms/WMS.IDAL/IBaseRepository.cs b/Wms/WMS.IDAL/IBaseRepository.cs
index e144ee5..c423e3f 100644
--- a/Wms/WMS.IDAL/IBaseRepository.cs
+++ b/Wms/WMS.IDAL/IBaseRepository.cs
@@ -28,8 +28,8 @@
         Task SaveAsync();
 
 
-        ISugarQueryable<T> GetAllAsync();
-
+        ISugarQueryable<T> GetAll();
+        Task<List<T>> GetAllAsync();
         T GetOneById(int id);
         Task<T> GetOneByIdAsync(int id);
 
@@ -37,9 +37,9 @@
 
         T GetModel(string sqlString);
         
-        ISugarQueryable<T> GetAllWhereAsync(Expression<Func<T, bool>> predicate);
-        ISugarQueryable<T> GeTAllByPageAsync(Expression<Func<T, bool>> predicate,int pageSize,int pageIndex, out int count);
-        ISugarQueryable<T> GetAllByOrderAsync(Expression<Func<T, bool>> predicate, bool asc = true);
-        ISugarQueryable<T> GetAllByOrderPageAsync(Expression<Func<T, bool>> predicate, int pageSize , int pageIndex , out int count,bool asc = true);
+        ISugarQueryable<T> GetAllWhere(Expression<Func<T, bool>> predicate);
+        ISugarQueryable<T> GeTAllByPage(Expression<Func<T, bool>> predicate,int pageSize,int pageIndex, out int count);
+        ISugarQueryable<T> GetAllByOrder(Expression<Func<T, bool>> predicate, bool asc = true);
+        ISugarQueryable<T> GetAllByOrderPage(Expression<Func<T, bool>> predicate, int pageSize , int pageIndex , out int count,bool asc = true);
     }
 }

--
Gitblit v1.8.0