Merge branch 'master' of github.com:donet5/SqlSugar

Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs

@@ -1078,6 +1078,18 @@ namespace SqlSugar
             }
             return this;
         }
+
+        public ISugarQueryable<T> GroupByIF(bool isGroupBy, string groupFields)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(groupFields);
+            }
+
+            return this;
+        }
+
+
         public virtual ISugarQueryable<T> OrderByIF(bool isOrderBy, string orderFileds)
         {
             if (isOrderBy)

Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs

@@ -117,6 +117,8 @@ namespace SqlSugar
         ISugarQueryable<T> GroupBy(string groupFileds);
         ISugarQueryable<T> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression);
 
+        ISugarQueryable<T> GroupByIF(bool isGroupBy, string groupFields);
+
         ISugarQueryable<T> PartitionBy(Expression<Func<T, object>> expression);
         ISugarQueryable<T> PartitionBy(string groupFileds);
 

Src/OracleUS7ASCII/US7ASCII乱码.txt

@@ -1 +1 @@
-US7ASCII 乱码传用版本
+US7ASCII 乱码专用版本