Merge remote-tracking branch 'origin/3.0' into 3.0

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/AbstractWrapper.java

@@ -355,6 +355,7 @@ public abstract class AbstractWrapper<T, R, This extends AbstractWrapper<T, R, T
         return doIt(condition, GROUP_BY, () -> columnsToString(columns));
     }
 
+    @SuppressWarnings("all")
     @Override
     public This orderBy(boolean condition, boolean isAsc, R... columns) {
         if (ArrayUtils.isEmpty(columns)) {
@@ -375,6 +376,7 @@ public abstract class AbstractWrapper<T, R, This extends AbstractWrapper<T, R, T
      * @param columns 多字段
      * @return
      */
+    @SuppressWarnings("all")
     protected String columnsToString(R... columns) {
         return Arrays.stream(columns).map(this::columnToString).collect(joining(","));
     }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/interfaces/Func.java

@@ -118,6 +118,7 @@ public interface Func<This, R> extends Serializable {
      * @param columns 分组字段【可多个】
      * @return
      */
+    @SuppressWarnings("all")
     default This groupBy(R... columns) {
         return groupBy(true, columns);
     }
@@ -131,8 +132,17 @@ public interface Func<This, R> extends Serializable {
      * @param columns   分组字段【可多个】
      * @return
      */
+    @SuppressWarnings("all")
     This groupBy(boolean condition, R... columns);
 
+    /**
+     * 排序：ORDER BY 字段, ...
+     */
+    @SuppressWarnings("all")
+    default This orderByAsc(R... columns) {
+        return orderByAsc(true, columns);
+    }
+
     /**
      * <p>
      * 排序：ORDER BY 字段, ... ASC
@@ -142,10 +152,19 @@ public interface Func<This, R> extends Serializable {
      * @param columns   排序字段【可多个】
      * @return
      */
+    @SuppressWarnings("all")
     default This orderByAsc(boolean condition, R... columns) {
         return orderBy(condition, true, columns);
     }
 
+    /**
+     * 排序：ORDER BY 字段, ...
+     */
+    @SuppressWarnings("all")
+    default This orderByDesc(R... columns) {
+        return orderByDesc(true, columns);
+    }
+
     /**
      * <p>
      * 排序：ORDER BY 字段, ... DESC
@@ -155,6 +174,7 @@ public interface Func<This, R> extends Serializable {
      * @param columns   排序字段【可多个】
      * @return
      */
+    @SuppressWarnings("all")
     default This orderByDesc(boolean condition, R... columns) {
         return orderBy(condition, false, columns);
     }
@@ -162,20 +182,7 @@ public interface Func<This, R> extends Serializable {
     /**
      * 排序：ORDER BY 字段, ...
      */
-    default This orderByAsc(R... columns) {
-        return orderBy(true, true, columns);
-    }
-
-    /**
-     * 排序：ORDER BY 字段, ...
-     */
-    default This orderByDesc(R... columns) {
-        return orderBy(true, false, columns);
-    }
-
-    /**
-     * 排序：ORDER BY 字段, ...
-     */
+    @SuppressWarnings("all")
     This orderBy(boolean condition, boolean isAsc, R... columns);
 
     /**