javadoc compile error modify

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java

@@ -130,10 +130,10 @@ public class ThreadUtils {
 
     /**
      * Wrapper over ScheduledThreadPoolExecutor
-     * @param threadName
+     * @param threadName threadName
-     * @param corePoolSize
+     * @param corePoolSize corePoolSize
-     * @param isDaemon
+     * @param isDaemon isDaemon
-     * @return
+     * @return ScheduledThreadPoolExecutor
      */
     public static ScheduledExecutorService newThreadScheduledExecutor(String threadName, int corePoolSize, boolean isDaemon) {
         ThreadFactory threadFactory = new ThreadFactoryBuilder()

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java

@@ -425,10 +425,7 @@ public class HadoopUtils implements Closeable {
     }
 
     /**
-<<<<<<< HEAD
      * get data hdfs path
-=======
->>>>>>> remotes/upstream/dev
      * @return data hdfs path
      */
     public static String getHdfsDataBasePath() {

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Preconditions.java

@@ -75,7 +75,7 @@ public final class Preconditions {
      * @param errorMessageArgs The arguments for the error message, to be inserted into the
      *                         message template for the {@code %s} placeholders.
      *
-     * @param <T>
+     * @param <T> T
      * @return The object reference itself (generically typed).
      */
     public static <T> T checkNotNull(T reference,